diff --git a/src/js/terminal.js b/src/js/terminal.js
index a5c736876..9a4a18b30 100644
--- a/src/js/terminal.js
+++ b/src/js/terminal.js
@@ -232,10 +232,10 @@ app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client
             var result = $scope.selectedAppInfo;
 
             // we expect this to be called _after_ a reconfigure was issued
-            if (result.installationState === 'pending_configure') {
-                $scope.appBusy = true;
-            } else if (result.installationState === 'installed') {
+            if (result.installationState === 'installed') {
                 $scope.appBusy = false;
+            } else if (result.installationState !== 'error') {
+                $scope.appBusy = true;
             }
 
             $scope.schedulerTasks = result.manifest.addons.scheduler ? Object.keys(result.manifest.addons.scheduler).map(function (k) { return { name: k, command: result.manifest.addons.scheduler[k].command }; }) : [];
diff --git a/src/terminal.html b/src/terminal.html
index a46404b62..b918e2d98 100644
--- a/src/terminal.html
+++ b/src/terminal.html
@@ -110,7 +110,7 @@
                 </div>
                 <div class="modal-body">
                     <p>This will restart the app in repair mode. The app will start in a paused state and can be used to fix broken plugins or database content.</p>
-                    <p class="text-danger text-bold">The app will not be reachable in repair mode!</p>
+                    <p class="text-danger text-bold">The app will not be reachable in repair mode.</p>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
@@ -156,8 +156,8 @@
         <div class="terminal-container" id="terminalContainer" ng-hide="appBusy"></div>
         <div class="terminal-container placeholder" ng-show="appBusy">
             <h4>&nbsp;
-                <span ng-show="selectedAppInfo.installationState === 'pending_configure' && selectedAppInfo.debugMode">Restarting app for repair...</span>
-                <span ng-show="selectedAppInfo.installationState === 'pending_configure' && !selectedAppInfo.debugMode ">App is being reconfigured...</span>
+                <span ng-show="selectedAppInfo.installationState === 'pending_debug' && selectedAppInfo.debugMode">Restarting app for repair...</span>
+                <span ng-show="selectedAppInfo.installationState === 'pending_debug' && !selectedAppInfo.debugMode ">App is being reconfigured...</span>
                 <span ng-show="selectedAppInfo.installationState === 'installed' && !selectedAppInfo.debugMode">Waiting for app to start...</span>
                 <span ng-show="selectedAppInfo.installationState === 'pending_installed'">App is being installed...</span>
             </h4>