diff --git a/src/js/client.js b/src/js/client.js
index c65bce1eb..50b1eb344 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1853,6 +1853,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
 
             // amend properties to mimick full app
             data.applinks.forEach(function (applink) {
+                applink.type = 'applink';
                 applink.fqdn = applink.upstreamUri; // this fqdn may contain the protocol!
                 applink.manifest = { addons: {}};
                 applink.installationState = ISTATES.INSTALLED;
@@ -1879,6 +1880,15 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
+    Client.prototype.removeApplink = function (id, callback) {
+        del('/api/v1/applinks/' + id, null, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 204) return callback(new ClientError(status, data));
+
+            callback(null);
+        });
+    };
+
     Client.prototype.addUser = function (user, callback) {
         var data = {
             email: user.email,
diff --git a/src/views/apps.html b/src/views/apps.html
index c9024d47c..c77b275d9 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -56,6 +56,32 @@
   </div>
 </div>
 
+<!-- Modal applinks edit -->
+<div class="modal fade" id="applinksEditModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Edit external app link</h4>
+      </div>
+      <div class="modal-body">
+        <form name="applinksEditForm" role="form" ng-submit="applinksEdit.submit()" autocomplete="off">
+          <div class="form-group" ng-class="{ 'has-error': (applinksEditForm.upstreamUri.$dirty && applinksEditForm.upstreamUri.$invalid) || (!applinksEditForm.upstreamUri.$dirty && applinksEdit.error.upstreamUri) }">
+            <label class="control-label">UpstreamURI</label>
+            <input type="text" class="form-control" ng-model="applinksEdit.upstreamUri" name="upstreamUri" id="inputUpstreamUri" autofocus autocomplete="off" required>
+          </div>
+
+          <input class="ng-hide" type="submit" ng-disabled="applinksEditForm.$invalid || applinksEdit.busy"/>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-danger pull-left" ng-click="applinksEdit.remove()">Delete</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
+        <button type="button" class="btn btn-success" ng-click="applinksEdit.submit()">{{ 'main.dialog.save' | tr }}</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <div class="content content-large">
 
     <!-- Workaround for select-all issue, see commit message -->
@@ -99,7 +125,8 @@
       <div class="app-grid">
         <div class="grid-item" ng-class="{ 'stopped': app.runState === 'stopped' }" ng-repeat="app in installedApps | selectedGroupAccessFilter:selectedGroup | selectedStateFilter:selectedState | selectedTagFilter:selectedTags | selectedDomainFilter:selectedDomain | appSearchFilter:appSearch | orderBy:'fqdn'" ng-class="{ 'admin-action': app.manifest.configurePath && (app | applicationLink) }">
           <div class="grid-item-content" uib-tooltip="{{ app.fqdn }}">
-            <a ng-show="isOperator(app)" ng-href="#/app/{{ app.id}}/display" class="btn btn-lg btn-default grid-item-action"><i class="fas fa-cog"></i></a>
+            <a ng-show="app.type !== 'applink' && isOperator(app)" ng-href="#/app/{{ app.id}}/display" class="btn btn-lg btn-default grid-item-action"><i class="fas fa-cog"></i></a>
+            <div ng-show="app.type === 'applink' && isOperator(app)" ng-click="applinksEdit.show(app)" class="btn btn-lg btn-default grid-item-action"><i class="fas fa-cog"></i></div>
             <a ng-href="{{ app | applicationLink }}" ng-click="isOperator(app) && (((app | installError) === true || (app | installationActive) === true) && showAppConfigure(app, 'repair')) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && appPostInstallConfirm.show(app))" target="_blank" ng-class="{ 'hand': (app | appIsInstalledAndHealthy) || (app | installError)  || (app | installationActive)}">
               <div class="grid-item-top">
                 <div class="row">
diff --git a/src/views/apps.js b/src/views/apps.js
index ba29ba4dd..1105d6f3a 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -115,6 +115,38 @@ angular.module('Application').controller('AppsController', ['$scope', '$translat
         }
     };
 
+    $scope.applinksEdit = {
+        error: {},
+        busy: false,
+        id: '',
+        upstreamUri: '',
+
+        show: function (applink) {
+            $scope.applinksEdit.error = {};
+            $scope.applinksEdit.busy = false;
+            $scope.applinksEdit.id = applink.id;
+            $scope.applinksEdit.upstreamUri = applink.upstreamUri;
+
+            $('#applinksEditModal').modal('show');
+
+            return false; // prevent propagation and default
+        },
+
+        submit: function () {
+            $('#applinksEditModal').modal('hide');
+        },
+
+        remove: function () {
+            Client.removeApplink($scope.applinksEdit.id, function (error) {
+                if (error) return console.error('Failed to remove applink', error);
+
+                Client.refreshInstalledApps();
+
+                $('#applinksEditModal').modal('hide');
+            });
+        }
+    };
+
     $scope.showAppConfigure = function (app, view) {
         $location.path('/app/' + app.id + '/' + view);
     };