diff --git a/src/index.html b/src/index.html
index 44a409d3d..51462c767 100644
--- a/src/index.html
+++ b/src/index.html
@@ -107,6 +107,25 @@
 
     <a class="offline-banner animateMe" ng-show="client.offline" ng-cloak href="https://docs.cloudron.io/troubleshooting/" target="_blank"><i class="fa fa-circle-notch fa-spin"></i> {{ 'main.offline' | tr }}</a>
 
+    <!-- Modal reboot server -->
+    <div class="modal fade" id="rebootModal" tabindex="-1" role="dialog">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h4 class="modal-title">Really reboot server?</h4>
+          </div>
+          <div class="modal-body">
+            <p class="text-bold">Rebooting the server will cause temporary downtime for all apps installed on this Cloudron!</p>
+            <p>Use this to apply security updates or if you experience unexpected behaviour. All apps and services currently running on this Cloudron will automatically start when the reboot is complete.</p>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+            <button type="button" class="btn btn-danger" ng-click="reboot.submit()" ng-disabled="reboot.busy"><i class="fa fa-circle-notch fa-spin" ng-show="reboot.busy"></i> Reboot now</button>
+          </div>
+        </div>
+      </div>
+    </div>
+
     <div class="animateMe ng-hide layout-root" ng-show="initialized">
 
         <!-- Navigation -->
diff --git a/src/js/main.js b/src/js/main.js
index 83fa64bbb..1294bf5d9 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -13,6 +13,28 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
     $scope.notifications = [];
     $scope.hideNavBarActions = $location.path() === '/logs';
 
+    $scope.reboot = {
+        busy: false,
+
+        show: function () {
+            $scope.reboot.busy = false;
+            $('#rebootModal').modal('show');
+        },
+
+        submit: function () {
+            $scope.reboot.busy = true;
+
+            Client.reboot(function (error) {
+                if (error) return Client.error(error);
+
+                $('#rebootModal').modal('hide');
+
+                // trigger refetch to show offline banner
+                $timeout(function () { Client.getStatus(function () {}); }, 5000);
+            });
+        }
+    };
+
     $scope.isActive = function (url) {
         if (!$route.current) return false;
         return $route.current.$$route.originalPath.indexOf(url) === 0;
diff --git a/src/views/notifications.html b/src/views/notifications.html
index aac43dce4..310987edf 100644
--- a/src/views/notifications.html
+++ b/src/views/notifications.html
@@ -1,21 +1,3 @@
-<!-- Modal reboot server -->
-<div class="modal fade" id="rebootModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">Really reboot server?</h4>
-      </div>
-      <div class="modal-body">
-        <p class="text-bold">Rebooting the server will cause temporary downtime for all apps installed on this Cloudron!</p>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-        <button type="button" class="btn btn-danger" ng-click="reboot.submit()" ng-disabled="reboot.busy"><i class="fa fa-circle-notch fa-spin" ng-show="reboot.busy"></i> Reboot now</button>
-      </div>
-    </div>
-  </div>
-</div>
-
 <div class="content">
 
   <div class="text-left">
@@ -44,7 +26,7 @@
           <br/>
           <p ng-hide="notification.messageJson" ng-click="$event.stopPropagation();" style="cursor: auto; overflow: auto;" ng-bind-html="notification.message | markdown2html"></p>
           <pre ng-show="notification.messageJson" ng-click="$event.stopPropagation();" style="cursor: auto">{{ notification.messageJson | json }}</pre>
-          <button type="button" class="btn btn-danger pull-right" ng-click="$event.stopPropagation(); reboot.show(event)" ng-show="notification.title === 'Reboot Required'" ng-disabled="reboot.busy"><i class="fa fa-circle-notch fa-spin" ng-show="reboot.busy"></i> Reboot</button>
+          <button type="button" class="btn btn-danger pull-right" ng-click="$event.stopPropagation(); $parent.reboot.show()" ng-show="notification.title === 'Reboot Required'" ng-disabled="reboot.busy"><i class="fa fa-circle-notch fa-spin" ng-show="reboot.busy"></i> Reboot</button>
         </div>
       </div>
     </div>
diff --git a/src/views/notifications.js b/src/views/notifications.js
index 4067a84c5..fbfb19b6c 100644
--- a/src/views/notifications.js
+++ b/src/views/notifications.js
@@ -2,34 +2,10 @@
 
 /* global async */
 /* global angular */
-/* global $ */
 
 angular.module('Application').controller('NotificationsController', ['$scope', '$timeout', 'Client', function ($scope, $timeout, Client) {
-
     $scope.clearAllBusy = false;
 
-    $scope.reboot = {
-        busy: false,
-
-        show: function () {
-            $scope.reboot.busy = false;
-            $('#rebootModal').modal('show');
-        },
-
-        submit: function () {
-            $scope.reboot.busy = true;
-
-            Client.reboot(function (error) {
-                if (error) return Client.error(error);
-
-                $('#rebootModal').modal('hide');
-
-                // trigger refetch to show offline banner
-                $timeout(function () { Client.getStatus(function () {}); }, 5000);
-            });
-        }
-    };
-
     $scope.notifications = {
         notifications: [],
         activeNotification: null,
diff --git a/src/views/system.html b/src/views/system.html
index 4d51e3f15..4f6a3d803 100644
--- a/src/views/system.html
+++ b/src/views/system.html
@@ -1,29 +1,10 @@
-<!-- Modal reboot server -->
-<div class="modal fade" id="rebootModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h4 class="modal-title">Really reboot server?</h4>
-      </div>
-      <div class="modal-body">
-        <p class="text-danger">Rebooting the server will cause temporary downtime for all apps installed on this Cloudron!</p>
-        <p>Use this to apply security updates or if you experience unexpected behaviour. All apps and services currently running on this Cloudron will automatically start when the reboot is complete.</p>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-        <button type="button" class="btn btn-danger" ng-click="reboot.submit()" ng-disabled="reboot.busy"><i class="fa fa-circle-notch fa-spin" ng-show="reboot.busy"></i> Reboot now</button>
-      </div>
-    </div>
-  </div>
-</div>
-
 <div class="content">
 
   <div class="text-left">
     <h1>
       {{ 'system.title' | tr }}
       <a class="btn btn-default pull-right" href="/logs.html?id=box" target="_blank">Show Logs</a>
-      <button class="btn btn-default pull-right" ng-click="reboot.show()" ng-disabled="reboot.busy"><i class="fa fa-circle-notch fa-spin" ng-show="reboot.busy"></i> Reboot</button>
+      <button class="btn btn-default pull-right" ng-click="$parent.reboot.show()">Reboot</button>
     </h1>
   </div>
 
diff --git a/src/views/system.js b/src/views/system.js
index 9387f6f32..36a83918d 100644
--- a/src/views/system.js
+++ b/src/views/system.js
@@ -29,26 +29,6 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
         return getRandomColor();
     }
 
-    $scope.reboot = {
-        busy: false,
-        show: function () {
-            $scope.reboot.busy = false;
-            $('#rebootModal').modal('show');
-        },
-        submit: function () {
-            $scope.reboot.busy = true;
-
-            Client.reboot(function (error) {
-                if (error) return Client.error(error);
-
-                $('#rebootModal').modal('hide');
-
-                // trigger refetch to show offline banner
-                $timeout(function () { Client.getStatus(function () {}); }, 8000);
-            });
-        }
-    };
-
     $scope.disks = {
         busy: true,
         errorMessage: '',