diff --git a/src/views/app.html b/src/views/app.html
index df68b6eed..366735d11 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -323,7 +323,7 @@
         <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('console')" ng-class="{ 'active': view === 'console', 'disabled': app.error }">Console</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>
       </div>
@@ -733,7 +733,7 @@
           <div class="col-md-12">
             <label class="control-label">Console Access</label>
             <p>This will open a console connection to the app. The terminal is sandboxed and only provides access to this app container's filesystem.</p>
-            <a class="btn btn-primary pull-right" ng-href="{{ app.health !== 'healthy' ? '' : '/terminal.html?id=' + app.id }}" ng-disabled="app.health !== 'healthy'" tooltip-class="long"  tooltip-enable="app.health !== 'healthy'" uib-tooltip="App is not running. If app is constantly restarting, Repair it first." target="_blank">Terminal</a>
+            <a class="btn btn-primary pull-right" ng-href="{{ (app.installationState === 'installed' && app.health === 'healthy') ? '/terminal.html?id=' + app.id : '' }}" ng-disabled="app.installationState !== 'installed' || app.health !== 'healthy'" tooltip-class="long"  tooltip-enable="app.installationState !== 'installed' || app.health !== 'healthy'" uib-tooltip="App is not running. If app is constantly restarting, Repair it first." target="_blank">Terminal</a>
             <a class="btn btn-primary pull-right" ng-href="{{ '/logs.html?appId=' + app.id }}" target="_blank">Logs</a>
           </div>
         </div>
diff --git a/src/views/app.js b/src/views/app.js
index 011921f94..d3d8b08a1 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -40,7 +40,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         if ($scope.view === view) return;
 
         // on error only allow uninstall or repair view
-        if ($scope.app.error && view !== 'uninstall') view = 'repair';
+        if ($scope.app.error && !(view === 'uninstall' || view === 'console')) view = 'repair';
 
         $route.updateParams({ view: view });
         $scope[view].show();
@@ -1089,7 +1089,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
     function switchView() {
         // Immediately move to debug view on error
-        if ($scope.app.error && !($scope.view === 'repair' || $scope.view === 'uninstall')) $scope.setView('repair');
+        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
     }