diff --git a/src/js/client.js b/src/js/client.js
index 7e579346e..53d178c00 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -488,7 +488,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
             if (error) return callback(error);
             if (status !== 202) return callback(new ClientError(status, data));
 
-            callback(null);
+            callback(null, data);
         });
     };
 
@@ -497,7 +497,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
             if (error) return callback(error);
             if (status !== 202) return callback(new ClientError(status, data));
 
-            callback(null);
+            callback(null, data);
         });
     };
 
@@ -506,7 +506,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
             if (error) return callback(error);
             if (status !== 202) return callback(new ClientError(status, data));
 
-            callback(null);
+            callback(null, data);
         });
     };
 
diff --git a/src/views/app.html b/src/views/app.html
index 703822e69..54c1e794f 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -712,8 +712,10 @@
             <label class="control-label">Repair</label>
             <p>If the app is not responding, try restarting the app.</p>
             <button class="btn btn-success" ng-click="repair.show()" ng-show="app.error">Repair App</button>
+            <button class="btn btn-success pull-right" ng-class="{ 'btn-danger': app.runState === 'running' }" ng-click="debug.toggleRunState()" ng-disabled="app.taskId || debug.busyRunState"><i class="fa fa-circle-notch fa-spin" ng-show="debug.appIsRestarting"></i>
+              {{ app.runState === 'running' ? 'Stop App' : 'Start App' }}
+            </button>
             <button class="btn btn-danger pull-right" ng-click="debug.stopAppTask(app.taskId)" ng-show="app.taskId">Cancel Current Task</button>
-            <button class="btn btn-danger pull-right" ng-click="debug.restartApp()" ng-disabled="app.taskId || debug.appIsRestarting"><i class="fa fa-circle-notch fa-spin" ng-show="debug.appIsRestarting"></i> Restart App</button>
           </div>
         </div>
       </div>
diff --git a/src/views/app.js b/src/views/app.js
index e6f3539d2..862339b97 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -667,7 +667,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
     $scope.debug = {
         show: function () {},
-        appIsRestarting: false,
+        busyRunState: false,
 
         stopAppTask: function (taskId) {
             Client.stopTask(taskId, function (error) {
@@ -676,16 +676,16 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             });
         },
 
-        restartApp: function () {
-            $scope.debug.appIsRestarting = true;
+        toggleRunState: function () {
+            var func  = $scope.app.runState === RSTATES.STOPPED ? Client.startApp : Client.stopApp;
+            $scope.debug.busyRunState = true;
 
-            function done(error) {
-                if (error) Client.error(error);
-                $scope.debug.appIsRestarting = false;
-            }
+            func($scope.app.id, function (error) {
+                $scope.debug.busyRunState = false;
+                if (error) return Client.error(error);
 
-            if ($scope.app.runState === RSTATES.STOPPED) Client.startApp($scope.app.id, done);
-            else Client.restartApp($scope.app.id, done);
+                refreshApp();
+            });
         }
     };