diff --git a/src/js/client.js b/src/js/client.js
index 123707576..eeb58d765 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -21,6 +21,7 @@ var ISTATES = {
     PENDING_DEBUG: 'pending_debug',
     PENDING_START: 'pending_start',
     PENDING_STOP: 'pending_stop',
+    PENDING_RESTART: 'pending_restart',
     ERROR: 'error',
     INSTALLED: 'installed'
 };
@@ -555,25 +556,11 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
     };
 
     Client.prototype.restartApp = function (id, callback) {
-        var that = this;
-
-        function waitUntilStopped(callback) {
-            that.getApp(id, function (error, result) {
-                if (error) return callback(error);
-
-                if (result.runState === 'stopped') return callback();
-                setTimeout(waitUntilStopped.bind(null, callback), 2000);
-            });
-        }
-
-        that.stopApp(id, function (error) {
+        post('/api/v1/apps/' + id + '/start', {}, null, function (error, data, status) {
             if (error) return callback(error);
+            if (status !== 202) return callback(new ClientError(status, data));
 
-            waitUntilStopped(function (error) {
-                if (error) return callback(error);
-
-                that.startApp(id, callback);
-            });
+            callback(null, data);
         });
     };
 
diff --git a/src/js/index.js b/src/js/index.js
index ac4242566..b8c60d73f 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -327,6 +327,7 @@ app.filter('installationStateLabel', function () {
         case ISTATES.PENDING_BACKUP: return 'Backing up' + waiting;
         case ISTATES.PENDING_START: return 'Starting' + waiting;
         case ISTATES.PENDING_STOP: return 'Stopping' + waiting;
+        case ISTATES.PENDING_RESTART: return 'Restarting' + waiting;
         case ISTATES.ERROR: {
             if (app.error && app.error.message === 'ETRYAGAIN') return 'DNS Error';
             return 'Error';
@@ -363,6 +364,7 @@ app.filter('taskName', function () {
         case ISTATES.PENDING_BACKUP: return 'backup';
         case ISTATES.PENDING_START: return 'start app';
         case ISTATES.PENDING_STOP: return 'stop app';
+        case ISTATES.PENDING_RESTART: return 'restart app';
         default: return installationState || '';
         }
     };
diff --git a/src/js/terminal.js b/src/js/terminal.js
index a4e6e4f47..b4faec9a4 100644
--- a/src/js/terminal.js
+++ b/src/js/terminal.js
@@ -127,27 +127,23 @@ app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client
 
         var appId = $scope.selected.value;
 
-        function waitUntilStopped(callback) {
+        function waitUntilRestarted(callback) {
             refreshApp(appId, function (error, result) {
                 if (error) return callback(error);
 
-                if (result.installationState === ISTATES.INSTALLED && result.runState === RSTATES.STOPPED) return callback();
-                setTimeout(waitUntilStopped.bind(null, callback), 2000);
+                if (result.installationState === ISTATES.INSTALLED) return callback();
+                setTimeout(waitUntilRestarted.bind(null, callback), 2000);
             });
         }
 
-        Client.stopApp(appId, function (error) {
-            if (error) console.error('Failed to stop app.', error);
+        Client.restartApp(appId, function (error) {
+            if (error) console.error('Failed to restart app.', error);
 
-            waitUntilStopped(function (error) {
-                if (error) console.error('Failed to get app status.', error);
+            waitUntilRestarted(function (error) {
+                if (error) console.error('Failed wait for restart.', error);
 
-                Client.startApp(appId, function (error) {
-                    if (error) console.error('Failed to start app.', error);
-
-                    $scope.restartAppBusy = false;
-                    $scope.appBusy = false;
-                });
+                $scope.restartAppBusy = false;
+                $scope.appBusy = false;
             });
         });
     };
diff --git a/src/views/app.html b/src/views/app.html
index f1b2da12f..34cfaf172 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -129,7 +129,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-        <button type="button" class="btn btn-success" ng-click="repair.submit()" ng-disabled="repair.busy"><i class="fa fa-circle-notch fa-spin" ng-show="repair.busy"></i> Repair</button>
+        <button type="button" class="btn btn-success" ng-click="repair.submit()" ng-disabled="repair.retryBusy"><i class="fa fa-circle-notch fa-spin" ng-show="repair.retryBusy"></i> Repair</button>
       </div>
     </div>
   </div>
@@ -731,7 +731,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="{{ '/terminal.html?id=' + app.id }}" target="_blank">Terminal</a>
+            <a class="btn btn-primary pull-right" ng-href="{{ '/terminal.html?id=' + app.id }}" ng-disabled="app.health !== 'healthy'" 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="{{ '/logs.html?appId=' + app.id }}" target="_blank">Logs</a>
           </div>
         </div>
@@ -754,19 +754,25 @@
         <div class="row">
           <div class="col-md-12">
             <label class="control-label">Crash Recovery</label>
-            <p>If the app is constantly restarting because of a broken plugin or misconfiguration, place the app in recovery mode.
+            <p>
+              If the app is not responding, try restarting the app. If the app is constantly restarting because of a broken plugin or misconfiguration,
+              place the app in recovery mode in order to access the console.
               Use the following <a target="_blank" ng-href="{{ config.webServerOrigin }}/documentation/troubleshooting/#unresponsive-app">instructions</a>
               to get the app running again.
             </p>
             <button class="btn btn-primary pull-right" ng-click="repair.pauseAppBegin()" ng-show="!app.debugMode" ng-disabled="repair.pauseBusy || app.error">Enable Recovery Mode</button>
             <button class="btn btn-primary pull-right" ng-click="repair.pauseAppDone()" ng-show="app.debugMode" ng-disabled="repair.pauseBusy || app.error">Disable Recovery Mode</button>
+            <button class="btn btn-primary pull-right" ng-click="repair.restartApp()" ng-disabled="repair.restartBusy || app.error">
+              <i ng-show="repair.restartBusy" class="fa fa-circle-notch fa-spin"></i>
+              Restart App
+            </button>
           </div>
         </div>
         <hr/>
         <div class="row">
           <div class="col-md-12">
             <label class="control-label">Task Error</label>
-            <p>If a task (configuration, update, restore, backup) resulted in the app ending up in an error state, you can retry the operation.</p>
+            <p>If a configuration, update, restore or backup action resulted in an error, you can retry the task.</p>
             <p ng-show="app.error">An error occurred during the <b>{{ app.error.installationState | taskName }}</b> operation: <span class="text-danger"><b>{{ app.error.reason + ': ' + app.error.message }}</b></span></p>
             <button class="btn btn-primary pull-right" ng-click="repair.confirm()" ng-disabled="app.taskId">Retry {{ app.error.installationState | taskName }}</button>
 
diff --git a/src/views/app.js b/src/views/app.js
index 8b447a3fe..011921f94 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -801,7 +801,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
     };
 
     $scope.repair = {
-        busy: false,
+        retryBusy: false,
         error: {},
 
         location: null,
@@ -816,7 +816,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         // this prepares the repair dialog with whatever is required for repair action
         confirm: function () {
             $scope.repair.error = {};
-            $scope.repair.busy = false;
+            $scope.repair.retryBusy = false;
             $scope.repair.location = null;
             $scope.repair.domain = null;
             $scope.repair.alternateDomains = [];
@@ -856,7 +856,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
         submit: function () {
             $scope.repair.error = {};
-            $scope.repair.busy = true;
+            $scope.repair.retryBusy = true;
 
             var errorState = ($scope.app.error && $scope.app.error.installationState) || ISTATES.PENDING_CONFIGURE;
             var data = {};
@@ -892,6 +892,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
             case ISTATES.PENDING_START:
             case ISTATES.PENDING_STOP:
+            case ISTATES.PENDING_RESTART:
             case ISTATES.PENDING_RESIZE:
             case ISTATES.PENDING_DEBUG:
             case ISTATES.PENDING_RECREATE_CONTAINER:
@@ -906,7 +907,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             repairFunc(function (error) {
                 if (error) return Client.error(error);
 
-                $scope.repair.busy = false;
+                $scope.repair.retryBusy = false;
                 $('#repairModal').modal('hide');
             });
         },
@@ -918,6 +919,23 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             });
         },
 
+        restartBusy: false,
+        restartApp: function () {
+            $scope.repair.restartBusy = true;
+
+            Client.restartApp($scope.app.id, function (error) {
+                if (error) return console.error(error);
+
+                refreshApp($scope.app.id, function () {
+                    waitForAppTask(function (error) {
+                        if (error) return Client.error(error);
+
+                        $scope.repair.restartBusy = false;
+                    });
+                });
+            });
+        },
+
         pauseBusy: false,
 
         pauseAppBegin: function () {