diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html
index 4ef39f089..3576bf762 100644
--- a/webadmin/src/views/appstore.html
+++ b/webadmin/src/views/appstore.html
@@ -114,10 +114,10 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                <button type="button" class="btn btn-success" ng-show="config.provider === 'caas' && !appInstall.installFormVisible && user.admin && appInstall.resourceConstraintVisible" ng-click="showRequestUpgrade()">Upgrade Cloudron</button>
-                <button type="button" class="btn btn-danger" ng-show="(config.isDev || config.provider !== 'caas') && !appInstall.installFormVisible && user.admin && appInstall.resourceConstraintVisible" ng-click="appInstall.showForm(true)">Install anyway</button>
-                <button type="button" class="btn btn-success" ng-show="!appInstall.installFormVisible && user.admin && !appInstall.resourceConstraintVisible" ng-click="appInstall.showForm()">Install</button>
-                <button type="button" class="btn btn-success" ng-show="appInstall.installFormVisible && user.admin && !appInstall.resourceConstraintVisible" ng-click="appInstall.submit()" ng-disabled="appInstallForm.$invalid || appInstall.busy"><i class="fa fa-spinner fa-pulse" ng-show="appInstall.busy"></i> Install</button>
+                <button type="button" class="btn btn-success" ng-show="config.provider === 'caas' && user.admin && appInstall.state === 'resourceConstraint'" ng-click="showRequestUpgrade()">Upgrade Cloudron</button>
+                <button type="button" class="btn btn-danger" ng-show="(config.isDev || config.provider !== 'caas') && user.admin && appInstall.state === 'resourceConstraint'" ng-click="appInstall.showForm(true)">Install anyway</button>
+                <button type="button" class="btn btn-success" ng-show="appInstall.state === 'appInfo' && user.admin" ng-click="appInstall.showForm()">Install</button>
+                <button type="button" class="btn btn-success" ng-show="appInstall.state === 'installForm' && user.admin" ng-click="appInstall.submit()" ng-disabled="appInstallForm.$invalid || appInstall.busy"><i class="fa fa-spinner fa-pulse" ng-show="appInstall.busy"></i> Install</button>
             </div>
         </div>
     </div>
diff --git a/webadmin/src/views/appstore.js b/webadmin/src/views/appstore.js
index bee305c02..8cb54daa5 100644
--- a/webadmin/src/views/appstore.js
+++ b/webadmin/src/views/appstore.js
@@ -24,8 +24,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
 
     $scope.appInstall = {
         busy: false,
-        installFormVisible: false,
-        resourceConstraintVisible: false,
+        state: 'appInfo',
         error: {},
         app: {},
         location: '',
@@ -58,8 +57,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
             $scope.appInstall.error = {};
             $scope.appInstall.location = '';
             $scope.appInstall.portBindings = {};
-            $scope.appInstall.installFormVisible = false;
-            $scope.appInstall.resourceConstraintVisible = false;
+            $scope.appInstall.state = 'appInfo';
             $scope.appInstall.mediaLinks = [];
             $scope.appInstall.certificateFile = null;
             $scope.appInstall.certificateFileName = '';
@@ -82,15 +80,13 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
 
         showForm: function (force) {
             if (Client.enoughResourcesAvailable($scope.appInstall.app) || force) {
-                $scope.appInstall.installFormVisible = true;
-                $scope.appInstall.resourceConstraintVisible = false;
+                $scope.appInstall.state = 'installForm';
                 $('#collapseMediaLinksCarousel').collapse('hide');
                 $('#collapseResourceConstraint').collapse('hide');
                 $('#collapseInstallForm').collapse('show');
                 $('#appInstallLocationInput').focus();
             } else {
-                $scope.appInstall.installFormVisible = false;
-                $scope.appInstall.resourceConstraintVisible = true;
+                $scope.appInstall.state = 'resourceConstraint';
                 $('#collapseMediaLinksCarousel').collapse('hide');
                 $('#collapseResourceConstraint').collapse('show');
             }