diff --git a/src/views/app.html b/src/views/app.html
index a2cb90d35..6c894e411 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -7,6 +7,26 @@
     }
 </script>
 
+
+<!-- Modal uninstall app -->
+<div class="modal fade" id="uninstallModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Really uninstall {{ app.fqdn }} ?</h4>
+      </div>
+      <div class="modal-body">
+        <p>Deleting the app will also remove all it's data. App backups are not removed and will be cleaned up based on the backup policy.</p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+        <button type="button" class="btn btn-danger" ng-click="uninstall.submit()" ng-disabled="uninstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="uninstall.busy"></i> Uninstall</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+
 <div class="content">
 
   <div class="task-indicator animateMe" ng-show="app.taskId">
@@ -57,7 +77,7 @@
         </p>
         <br/>
         <div>
-          <button class="btn btn-danger" ng-click="confirmUninstall()">Uninstall</button>
+          <button class="btn btn-danger" ng-click="uninstall.show()">Uninstall</button>
           <a class="btn btn-outline btn-primary pull-right" ng-href="https://{{ app.fqdn }}" target="_blank"><i class="fas fa-external-link-alt"></i> Open App</a>
           <a class="btn btn-outline btn-primary pull-right" ng-href="{{ app.manifest.documentationUrl }}" target="_blank">Documentation</a>
         </div>
diff --git a/src/views/app.js b/src/views/app.js
index 2becef493..80444b64f 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -411,6 +411,33 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         }
     };
 
+    $scope.uninstall = {
+        busy: false,
+        error: {},
+
+        show: function () {
+            $('#uninstallModal').modal('show');
+        },
+
+        submit: function () {
+            $scope.uninstall.busy = true;
+
+            Client.uninstallApp($scope.app.id, function (error) {
+                if (error && error.statusCode === 402) { // unpurchase failed
+                    Client.error('Relogin to Cloudron App Store');
+                } else if (error) {
+                    Client.error(error);
+                } else {
+                    $('#uninstallModal').modal('hide');
+                    Client.refreshAppCache($scope.app.id); // reflect the new app state immediately
+                    $location.path('/apps');
+                }
+
+                $scope.uninstall.busy = false;
+            });
+        }
+    };
+
     function fetchUsers(callback) {
         Client.getUsers(function (error, users) {
             if (error) return callback(error);
diff --git a/src/views/apps.html b/src/views/apps.html
index dfa501c76..d13d3c5c6 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -497,24 +497,6 @@
     </div>
 </div>
 
-<!-- Modal uninstall app -->
-<div class="modal fade" id="appUninstallModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">Really uninstall {{ appUninstall.app.fqdn }} ?</h4>
-      </div>
-      <div class="modal-body">
-        <p>Deleting the app will also remove all it's data. App backups are not removed and will be cleaned up based on the backup policy.</p>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-        <button type="button" class="btn btn-danger" ng-click="appUninstall.submit()" ng-disabled="appUninstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="appUninstall.busy"></i> Uninstall</button>
-      </div>
-    </div>
-  </div>
-</div>
-
 <!-- Modal update app -->
 <div class="modal fade" id="appUpdateModal" tabindex="-1" role="dialog">
     <div class="modal-dialog">
@@ -606,7 +588,6 @@
 
               <div class="grid-item-actions" ng-show="user.admin">
                 <a href="" ng-show="app | activeTask" ng-click="appCancel.show(app)" uib-tooltip="Cancel {{app | installationStateCancelTooltip}}" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-ban scale"></i></a>
-                <a href="" ng-hide="app | activeTask" ng-click="appUninstall.show(app)" uib-tooltip="Uninstall" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-times scale"></i></a>
                 <a href="" ng-hide="!backupsEnabled || (app | activeTask)" ng-click="appRestore.show(app)" uib-tooltip="Backups" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-archive scale"></i></a>
                 <a ng-href="#/app/{{ app.id}}" uib-tooltip="Configure" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-wrench scale"></i></a>
                 <a href="" ng-click="showInformation(app)" uib-tooltip="Information" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-info-circle scale"></i></a>
diff --git a/src/views/apps.js b/src/views/apps.js
index 601e8daf1..82f656ecb 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -286,38 +286,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         }
     };
 
-    $scope.appUninstall = {
-        busy: false,
-        error: {},
-        app: {},
-
-        show: function (app) {
-            $scope.reset();
-
-            $scope.appUninstall.app = app;
-
-            $('#appUninstallModal').modal('show');
-        },
-
-        submit: function () {
-            $scope.appUninstall.busy = true;
-
-            Client.uninstallApp($scope.appUninstall.app.id, function (error) {
-                if (error && error.statusCode === 402) { // unpurchase failed
-                    Client.error('Relogin to Cloudron App Store');
-                } else if (error) {
-                    Client.error(error);
-                } else {
-                    $('#appUninstallModal').modal('hide');
-                    Client.refreshAppCache($scope.appUninstall.app.id); // reflect the new app state immediately
-                    $scope.reset();
-                }
-
-                $scope.appUninstall.busy = false;
-            });
-        }
-    };
-
     $scope.appClone = {
         busy: false,
         error: {},
@@ -592,7 +560,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $('#appRestoreModal').modal('hide');
         $('#appUpdateModal').modal('hide');
         $('#appInfoModal').modal('hide');
-        $('#appUninstallModal').modal('hide');
         $('#appPostInstallConfirmModal').modal('hide');
 
         // reset configure dialog
@@ -620,10 +587,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.appConfigureForm.$setPristine();
         $scope.appConfigureForm.$setUntouched();
 
-        // reset uninstall dialog
-        $scope.appUninstall.app = {};
-        $scope.appUninstall.error = {};
-
         // reset update dialog
         $scope.appUpdate.error = {};
         $scope.appUpdate.app = {};
@@ -765,7 +728,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
     });
 
     // setup all the dialog focus handling
-    ['appConfigureModal', 'appUninstallModal', 'appUpdateModal', 'appRestoreModal', 'appInfoModal', 'appErrorModal'].forEach(function (id) {
+    ['appConfigureModal', 'appUpdateModal', 'appRestoreModal', 'appInfoModal', 'appErrorModal'].forEach(function (id) {
         $('#' + id).on('shown.bs.modal', function () {
             $(this).find("[autofocus]:first").focus();
         });