diff --git a/src/js/terminal.js b/src/js/terminal.js
index c2dc4375c..3b722d233 100644
--- a/src/js/terminal.js
+++ b/src/js/terminal.js
@@ -3,7 +3,7 @@
 /* global angular */
 /* global $ */
 /* global Terminal */
-/* global RSTATES */
+/* global RSTATES,ISTATES */
 
 // create main application module
 var app = angular.module('Application', ['angular-md5', 'ui-notification']);
@@ -123,13 +123,15 @@ app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client
 
     $scope.restartApp = function () {
         $scope.restartAppBusy = true;
+        $scope.appBusy = true;
+
         var appId = $scope.selected.value;
 
         function waitUntilStopped(callback) {
             refreshApp(appId, function (error, result) {
                 if (error) return callback(error);
 
-                if (result.runState === RSTATES.STOPPED) return callback();
+                if (result.installationState === ISTATES.INSTALLED && result.runState === RSTATES.STOPPED) return callback();
                 setTimeout(waitUntilStopped.bind(null, callback), 2000);
             });
         }
@@ -138,12 +140,13 @@ app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client
             if (error) console.error('Failed to stop app.', error);
 
             waitUntilStopped(function (error) {
-                if (error) return console.error('Failed to get app status.', error);
+                if (error) console.error('Failed to get app status.', error);
 
                 Client.startApp(appId, function (error) {
                     if (error) console.error('Failed to start app.', error);
 
                     $scope.restartAppBusy = false;
+                    $scope.appBusy = false;
                 });
             });
         });
@@ -234,13 +237,6 @@ 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 === '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 }; }) : [];
 
             $scope.terminal = new Terminal();
diff --git a/src/terminal.html b/src/terminal.html
index a0a1ffd48..6728d5a0c 100644
--- a/src/terminal.html
+++ b/src/terminal.html
@@ -129,7 +129,7 @@
 
             <div class="pull-right">
                 <div class="btn-group" ng-show="usesAddon('scheduler')">
-                  <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" ng-disabled="appBusy">
                     Scheduler/Cron <span class="caret"></span>
                   </button>
                   <ul class="dropdown-menu">
@@ -138,27 +138,27 @@
                 </div>
 
                 <!-- addon actions -->
-                <a class="btn btn-success" ng-click="terminalInject('mysql')" ng-show="usesAddon('mysql')">MySQL</a>
-                <a class="btn btn-success" ng-click="terminalInject('postgresql')" ng-show="usesAddon('postgresql')">Postgres</a>
-                <a class="btn btn-success" ng-click="terminalInject('mongodb')" ng-show="usesAddon('mongodb')">MongoDB</a>
-                <a class="btn btn-success" ng-click="terminalInject('redis')" ng-show="usesAddon('redis')">Redis</a>
+                <button class="btn btn-success" ng-click="terminalInject('mysql')" ng-show="usesAddon('mysql')" ng-disabled="appBusy">MySQL</button>
+                <button class="btn btn-success" ng-click="terminalInject('postgresql')" ng-show="usesAddon('postgresql')" ng-disabled="appBusy">Postgres</button>
+                <button class="btn btn-success" ng-click="terminalInject('mongodb')" ng-show="usesAddon('mongodb')" ng-disabled="appBusy">MongoDB</button>
+                <button class="btn btn-success" ng-click="terminalInject('redis')" ng-show="usesAddon('redis')" ng-disabled="appBusy">Redis</button>
 
                 <!-- terminal actions -->
-                <a class="btn btn-primary" ng-click="restartApp()" ng-show="selected.type === 'app'" ng-disabled="restartAppBusy"><i class="fa fa-sync-alt" ng-class="{ 'fa-spin': restartAppBusy }"></i> Restart</a>
-                <a class="btn btn-primary" ng-click="uploadFile()" ng-show="selected.type === 'app' && !uploadProgress.busy"><i class="fa fa-upload"></i> Upload to /tmp</a>
-                <a class="btn btn-primary" ng-click="uploadProgress.show()" ng-show="uploadProgress.busy"><i class="fa fa-circle-notch fa-spin"></i> Uploading...</a>
-                <a class="btn btn-primary" ng-click="downloadFile.show()" ng-show="selected.type === 'app'"><i class="fa fa-download"></i> Download</a>
-                <a class="btn btn-primary" ng-click="pauseApp()" ng-show="selected.type === 'app' && !selectedAppInfo.debugMode && !appBusy"><i class="fa fa-pause"></i> Pause</a>
-                <a class="btn btn-danger" ng-click="pauseAppDone()" ng-show="selectedAppInfo.debugMode && !appBusy"><i class="fa fa-play"></i> Resume</a>
+                <button class="btn btn-primary" ng-click="restartApp()" ng-show="selected.type === 'app'" ng-disabled="appBusy"><i class="fa fa-sync-alt" ng-class="{ 'fa-spin': restartAppBusy }"></i> Restart</button>
+                <button class="btn btn-primary" ng-click="uploadFile()" ng-show="selected.type === 'app' && !uploadProgress.busy" ng-disabled="appBusy"><i class="fa fa-upload"></i> Upload to /tmp</button>
+                <button class="btn btn-primary" ng-click="uploadProgress.show()" ng-show="uploadProgress.busy" ng-disabled="appBusy"><i class="fa fa-circle-notch fa-spin"></i> Uploading...</button>
+                <button class="btn btn-primary" ng-click="downloadFile.show()" ng-show="selected.type === 'app'" ng-disabled="appBusy"><i class="fa fa-download"></i> Download</button>
+                <button class="btn btn-primary" ng-click="pauseApp()" ng-show="selected.type === 'app' && !selectedAppInfo.debugMode" ng-disabled="appBusy"><i class="fa fa-pause"></i> Pause</button>
+                <button class="btn btn-danger" ng-click="pauseAppDone()" ng-show="selectedAppInfo.debugMode" ng-disabled="appBusy"><i class="fa fa-play"></i> Resume</button>
             </div>
         </div>
 
         <div class="terminal-container" id="terminalContainer" ng-hide="appBusy"></div>
         <div class="terminal-container placeholder" ng-show="appBusy">
             <h4>&nbsp;
+                <span ng-show="restartAppBusy">Restarting app...</span>
                 <span ng-show="selectedAppInfo.installationState === 'pending_debug' && selectedAppInfo.debugMode">Restarting app in paused mode...</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_debug' && !selectedAppInfo.debugMode ">App is being resumed...</span>
                 <span ng-show="selectedAppInfo.installationState === 'pending_installed'">App is being installed...</span>
             </h4>