diff --git a/src/views/apps.html b/src/views/apps.html
index 7585e0499..8553edd18 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -469,7 +469,7 @@
       </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="doUninstall()" ng-disabled="appUninstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="appUninstall.busy"></i> Uninstall</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>
@@ -565,7 +565,7 @@
               </div>
 
               <div class="grid-item-actions" ng-show="user.admin">
-                <a href="" ng-click="showUninstall(app)" uib-tooltip="Uninstall" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-times scale"></i></a>
+                <a href="" 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-click="appRestore.show(app)" ng-show="backupsEnabled" uib-tooltip="Backups" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-archive scale"></i></a>
                 <a href="" ng-click="appConfigure.show(app)" ng-show="(app.installationState === 'installed' || app.installationState === 'pending_configure') && !(app | installError)" uib-tooltip="Configure" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-pencil-alt scale"></i></a>
                 <a href="" ng-click="appConfigure.show(app)" ng-show="app | installError" uib-tooltip="Repair" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-wrench scale"></i></a>
diff --git a/src/views/apps.js b/src/views/apps.js
index 8aaf24159..ddf9c973d 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -278,7 +278,33 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
     $scope.appUninstall = {
         busy: false,
         error: {},
-        app: {}
+        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 = {
@@ -583,32 +609,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         return false; // prevent propagation and default
     };
 
-    $scope.showUninstall = function (app) {
-        $scope.reset();
-
-        $scope.appUninstall.app = app;
-
-        $('#appUninstallModal').modal('show');
-    };
-
-    $scope.doUninstall = 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.showUpdate = function (app, updateManifest) {
         $scope.reset();