diff --git a/src/views/app.html b/src/views/app.html
index 9691aa29f..3745986c8 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -1101,19 +1101,6 @@
             <a class="btn btn-primary pull-right" ng-href="{{ '/logs.html?appId=' + app.id }}" target="_blank">Logs</a>
           </div>
         </div>
-        <hr/>
-        <div class="row">
-          <div class="col-md-12">
-            <label class="control-label">Start / Stop</label>
-            <p>Apps can be stopped to conserve server resources. Future app backups will not include any app changes between now and the most recent app backup.
-              For this reason, it is recommended to trigger a backup before stopping the app.
-            </p>
-            <button class="btn btn-primary pull-right" ng-class="{ 'btn-danger': !console.startButton }" ng-click="console.toggleRunState()" ng-disabled="app.taskId || app.error || console.busyRunState" tooltip-enable="app.error || app.taskId" uib-tooltip="{{ app.error ? 'App is in error state' : 'App is busy' }}">
-              <i ng-show="app.installationState === 'pending_start' || app.installationState === 'pending_stop'" class="fa fa-circle-notch fa-spin"></i>
-              {{ console.startButton ? 'Start App' : 'Stop App' }}
-            </button>
-          </div>
-        </div>
       </div>
 
       <div class="card" ng-show="view === 'repair'">
@@ -1146,6 +1133,19 @@
       </div>
 
       <div class="card" ng-show="view === 'uninstall'">
+        <div class="row">
+          <div class="col-md-12">
+            <label class="control-label">Start / Stop</label>
+            <p>
+              Apps can be stopped to conserve server resources instead of unistallation. Future app backups will not include any app changes between now and the most recent app backup. For this reason, it is recommended to trigger a backup before stopping the app.
+            </p>
+            <button class="btn btn-primary pull-right" ng-class="{ 'btn-danger': !uninstall.startButton }" ng-click="uninstall.toggleRunState()" ng-disabled="app.taskId || app.error || app.installationState === 'pending_start' || app.installationState === 'pending_stop'">
+              <i ng-show="app.installationState === 'pending_start' || app.installationState === 'pending_stop'" class="fa fa-circle-notch fa-spin"></i>
+              {{ uninstall.startButton ? 'Start App' : 'Stop App' }}
+            </button>
+          </div>
+        </div>
+        <hr/>
         <div class="row">
           <div class="col-md-12">
             <label class="control-label">Uninstall</label>
diff --git a/src/views/app.js b/src/views/app.js
index dda35b3b8..d8e1e6221 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -1093,6 +1093,23 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
     $scope.uninstall = {
         busy: false,
         error: {},
+        busyRunState: false,
+        startButton: false,
+
+        toggleRunState: function () {
+            var func  = $scope.app.runState === RSTATES.STOPPED ? Client.startApp : Client.stopApp;
+            $scope.uninstall.busyRunState = true;
+
+            func($scope.app.id, function (error) {
+                if (error) return Client.error(error);
+
+                refreshApp($scope.app.id, function (error) {
+                    if (error) return Client.error(error);
+
+                    $timeout(function () { $scope.uninstall.busyRunState = false; }, 1000);
+                });
+            });
+        },
 
         show: function () {
             $scope.uninstall.error = {};
@@ -1126,24 +1143,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
     };
 
     $scope.console = {
-        show: function () {},
-        busyRunState: false,
-        startButton: false,
-
-        toggleRunState: function () {
-            var func  = $scope.app.runState === RSTATES.STOPPED ? Client.startApp : Client.stopApp;
-            $scope.console.busyRunState = true;
-
-            func($scope.app.id, function (error) {
-                if (error) return Client.error(error);
-
-                refreshApp($scope.app.id, function (error) {
-                    if (error) return Client.error(error);
-
-                    $timeout(function () { $scope.console.busyRunState = false; }, 1000);
-                });
-            });
-        }
+        show: function () {}
     };
 
     $scope.restore = {
@@ -1518,9 +1518,9 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
             // show 'Start App' if app is starting or is stopped
             if (app.installationState === ISTATES.PENDING_START || app.installationState === ISTATES.PENDING_STOP) {
-                $scope.console.startButton = app.installationState === ISTATES.PENDING_START;
+                $scope.uninstall.startButton = app.installationState === ISTATES.PENDING_START;
             } else {
-                $scope.console.startButton = app.runState === RSTATES.STOPPED;
+                $scope.uninstall.startButton = app.runState === RSTATES.STOPPED;
             }
 
             callback();