diff --git a/src/views/app.html b/src/views/app.html
index 366735d11..deccd89a7 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -315,14 +315,14 @@
   <div class="row app-configure-links-container">
     <div class="col-sm-2">
       <div class="app-configure-links">
-        <div ng-click="setView('display')" ng-class="{ 'active': view === 'display', 'disabled': app.error }">Display</div>
-        <div ng-click="setView('location')" ng-class="{ 'active': view === 'location', 'disabled': app.error }">Location</div>
-        <div ng-click="setView('access')" ng-class="{ 'active': view === 'access', 'disabled': app.error }">Access Control</div>
-        <div ng-click="setView('resources')" ng-class="{ 'active': view === 'resources', 'disabled': app.error }">Resources</div>
-        <div ng-click="setView('security')" ng-class="{ 'active': view === 'security', 'disabled': app.error }">Security</div>
-        <div ng-click="setView('email')" ng-class="{ 'active': view === 'email', 'disabled': app.error }" ng-show="app.manifest.addons.sendmail || app.manifest.addons.recvmail">Email</div>
-        <div ng-click="setView('updates')" ng-class="{ 'active': view === 'updates', 'disabled': app.error }">Updates</div>
-        <div ng-click="setView('backups')" ng-class="{ 'active': view === 'backups', 'disabled': app.error }">Backups</div>
+        <div ng-click="setView('display')" ng-class="{ 'active': view === 'display' }">Display</div>
+        <div ng-click="setView('location')" ng-class="{ 'active': view === 'location' }">Location</div>
+        <div ng-click="setView('access')" ng-class="{ 'active': view === 'access' }">Access Control</div>
+        <div ng-click="setView('resources')" ng-class="{ 'active': view === 'resources' }">Resources</div>
+        <div ng-click="setView('security')" ng-class="{ 'active': view === 'security' }">Security</div>
+        <div ng-click="setView('email')" ng-class="{ 'active': view === 'email' }" ng-show="app.manifest.addons.sendmail || app.manifest.addons.recvmail">Email</div>
+        <div ng-click="setView('updates')" ng-class="{ 'active': view === 'updates' }">Updates</div>
+        <div ng-click="setView('backups')" ng-class="{ 'active': view === 'backups' }">Backups</div>
         <div ng-click="setView('console')" ng-class="{ 'active': view === 'console' }">Console</div>
         <div ng-click="setView('repair')" ng-class="{ 'active': view === 'repair' }">Repair</div>
         <div ng-click="setView('uninstall')" ng-class="{ 'active': view === 'uninstall' }">Uninstall</div>
@@ -456,7 +456,9 @@
         </div>
         <div class="row">
           <div class="col-md-12 text-right">
-            <button class="btn btn-outline btn-primary pull-right" ng-click="location.submit()" ng-disabled="location.$invalid || location.busy"><i class="fa fa-circle-notch fa-spin" ng-show="location.busy"></i> Save</button>
+            <button class="btn btn-outline btn-primary pull-right" ng-click="location.submit()" ng-disabled="location.$invalid || location.busy || app.error" tooltip-enable="app.error" uib-tooltip="App is in error state">
+              <i class="fa fa-circle-notch fa-spin" ng-show="location.busy"></i> Save
+            </button>
           </div>
         </div>
       </div>
@@ -554,7 +556,9 @@
         </div>
         <div class="row">
           <div class="col-md-12 text-right">
-            <button class="btn btn-outline btn-primary pull-right" ng-click="resources.submitMemoryLimit()" ng-disabled="resources.memoryLimit === resources.currentMemoryLimit || resourcesForm.$invalid || resources.busy"><i class="fa fa-circle-notch fa-spin" ng-show="resources.busy"></i> Resize</button>
+            <button class="btn btn-outline btn-primary pull-right" ng-click="resources.submitMemoryLimit()" ng-disabled="resources.memoryLimit === resources.currentMemoryLimit || resourcesForm.$invalid || resources.busy || app.error" tooltip-enable="app.error" uib-tooltip="App is in error state">
+              <i class="fa fa-circle-notch fa-spin" ng-show="resources.busy"></i> Resize
+            </button>
           </div>
         </div>
         <hr/>
@@ -579,7 +583,9 @@
         </div>
         <div class="row">
           <div class="col-md-12 text-right">
-            <button class="btn btn-outline btn-primary pull-right" ng-click="resources.submitDataDir()" ng-disabled="!resourcesDataDirForm.$dirty || resourcesDataDirForm.$invalid || resources.busyDataDir"><i class="fa fa-circle-notch fa-spin" ng-show="resources.busyDataDir"></i> Move Data</button>
+            <button class="btn btn-outline btn-primary pull-right" ng-click="resources.submitDataDir()" ng-disabled="!resourcesDataDirForm.$dirty || resourcesDataDirForm.$invalid || resources.busyDataDir || app.error" tooltip-enable="app.error" uib-tooltip="App is in error state">
+              <i class="fa fa-circle-notch fa-spin" ng-show="resources.busyDataDir"></i> Move Data
+            </button>
           </div>
         </div>
       </div>
@@ -621,7 +627,9 @@
         </div>
         <div class="row">
           <div class="col-md-12 text-right">
-            <button class="btn btn-outline btn-primary pull-right" ng-click="email.submit()" ng-disabled="!emailForm.$dirty || email.busy"><i class="fa fa-circle-notch fa-spin" ng-show="email.busy"></i> Save</button>
+            <button class="btn btn-outline btn-primary pull-right" ng-click="email.submit()" ng-disabled="!emailForm.$dirty || email.busy || app.error" tooltip-enable="app.error" uib-tooltip="App is in error state">
+              <i class="fa fa-circle-notch fa-spin" ng-show="email.busy"></i> Save
+            </button>
           </div>
         </div>
       </div>
@@ -650,7 +658,9 @@
         <br/>
         <div class="row">
           <div class="col-md-12 text-right">
-            <button class="btn btn-outline btn-primary pull-right" ng-click="security.submit()" ng-disabled="security.$invalid || security.busy"><i class="fa fa-circle-notch fa-spin" ng-show="security.busy"></i> Save</button>
+            <button class="btn btn-outline btn-primary pull-right" ng-click="security.submit()" ng-disabled="security.$invalid || security.busy || app.error" tooltip-enable="app.error" uib-tooltip="App is in error state">
+              <i class="fa fa-circle-notch fa-spin" ng-show="security.busy"></i> Save
+            </button>
           </div>
         </div>
       </div>
@@ -663,7 +673,9 @@
             <p ng-show="!app.appStoreId">This app is running <code>{{ app.manifest.dockerImage }}</code> (Package v{{ app.manifest.version }}) and was last updated <code>{{ app.updateTime | prettyDate }}</code>.</p>
             <br/>
             <button class="btn btn-primary pull-right" uib-tooltip="{{ app.appStoreId ? '' : 'Not available for custom apps' }}" ng-disabled="!app.appStoreId" ng-click="updates.check()" ng-hide="config.update.apps[app.id].manifest.version && config.update.apps[app.id].manifest.version !== app.manifest.version" ng-disabled="updates.busyCheck"><i class="fa fa-circle-notch fa-spin" ng-show="updates.busyCheck"></i> Check for Updates</button>
-            <button class="btn btn-success pull-right" ng-click="updates.askUpdate()" ng-show="app.installationState !== 'pending_update' && config.update.apps[app.id].manifest.version && config.update.apps[app.id].manifest.version !== app.manifest.version" ng-disabled="app.taskId || !(app | installSuccess)">Update Available</button>
+            <button class="btn btn-success pull-right" ng-click="updates.askUpdate()" ng-show="app.installationState !== 'pending_update' && config.update.apps[app.id].manifest.version && config.update.apps[app.id].manifest.version !== app.manifest.version" ng-disabled="app.taskId || app.error" tooltip-enable="app.error" uib-tooltip="App is in error state">
+              Update Available
+            </button>
           </div>
         </div>
         <hr/>
@@ -683,7 +695,9 @@
             <label class="control-label">Backups</label>
 
             <div>
-              <button type="button" class="btn btn-primary pull-right" ng-click="backups.createBackup()" ng-disabled="app.taskId || backups.busyCreate"><i class="fa fa-circle-notch fa-spin" ng-show="app.installationState === 'pending_backup' || backups.busyCreate"></i> Create Backup</button>
+              <button type="button" class="btn btn-primary pull-right" ng-click="backups.createBackup()" ng-disabled="app.taskId || backups.busyCreate || app.error" tooltip-enable="app.error" uib-tooltip="App is in error state">
+                <i class="fa fa-circle-notch fa-spin" ng-show="app.installationState === 'pending_backup' || backups.busyCreate"></i> Create Backup
+              </button>
               <span>Backups are complete snapshots of the app. You can use app backups to restore or clone this app.</span>
             </div>
 
diff --git a/src/views/app.js b/src/views/app.js
index d3d8b08a1..8b9ef89b6 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -36,14 +36,11 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
     $scope.HOST_PORT_MAX = 65535;
     $scope.ROBOTS_DISABLE_INDEXING_TEMPLATE = '# Disable search engine indexing\n\nUser-agent: *\nDisallow: /';
 
-    $scope.setView = function (view) {
+    $scope.setView = function (view, skipViewShow) {
         if ($scope.view === view) return;
 
-        // on error only allow uninstall or repair view
-        if ($scope.app.error && !(view === 'uninstall' || view === 'console')) view = 'repair';
-
         $route.updateParams({ view: view });
-        $scope[view].show();
+        if (!skipViewShow) $scope[view].show();
         $scope.view = view;
     };
 
@@ -1087,18 +1084,16 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         $timeout(waitForAppTask.bind(null, callback), 2000); // not yet done
     }
 
-    function switchView() {
-        // Immediately move to debug view on error
-        if ($scope.app.error && !($scope.view === 'repair' || $scope.view === 'uninstall' || $scope.view === 'console')) $scope.setView('repair');
-
-        if (!$scope.view) $scope.setView($routeParams.view || 'display'); // first time
-    }
-
     Client.onReady(function () {
         refreshApp(appId, function (error) {
             if (error) return Client.error(error);
 
-            switchView();
+            // skipViewShow because we don't have all the values like domains/users to init the view yet
+            if ($routeParams.view) { // explicit route in url bar
+                $scope.setView($routeParams.view, true /* skipViewShow */);
+            } else { // default
+                $scope.setView($scope.app.error ? 'repair' : 'display', true /* skipViewShow */);
+            }
 
             asyncSeries([
                 fetchUsers,
@@ -1108,7 +1103,9 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             ], function (error) {
                 if (error) return Client.error(error);
 
-                var refreshTimer = $interval(function () { refreshApp($scope.app.id, switchView); }, 2000); // call with inline function to avoid iteration argument passed see $interval docs
+                $scope[$scope.view].show(); // initialize now that we have all the values
+
+                var refreshTimer = $interval(function () { refreshApp($scope.app.id); }, 2000); // call with inline function to avoid iteration argument passed see $interval docs
                 $scope.$on('$destroy', function () {
                     $interval.cancel(refreshTimer);
                 });