diff --git a/src/views/notifications.html b/src/views/notifications.html
index 01ec67aaa..ca0609ff0 100644
--- a/src/views/notifications.html
+++ b/src/views/notifications.html
@@ -1,3 +1,20 @@
+<!-- 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">
 
@@ -23,10 +40,12 @@
         {{ notification.title }} <small class="text-muted" uib-tooltip="{{ notification.creationTime | prettyLongDate }}">{{ notification.creationTime | prettyDate }}</small>
         <button class="btn btn-xs btn-success pull-right" ng-hide="notification.acknowledged" ng-click="notifications.ack(notification, $event)" uib-tooltip="Clear"><i class="fa fa-check"></i></button>
 
-        <div uib-collapse="notification.isCollapsed" expandi\ng="notificationExpanding(notification)">
+        <div uib-collapse="notification.isCollapsed" expanding="notificationExpanding(notification)">
           <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'">Reboot</button>
           <!-- This dumps the raw JSON event
           <br/>
           <h2 ng-show="notification.eventId && notification.busyLoadEvent" class="text-center"><i class="fa fa-circle-notch fa-spin"></i></h2>
diff --git a/src/views/notifications.js b/src/views/notifications.js
index 38719e6c2..29004d120 100644
--- a/src/views/notifications.js
+++ b/src/views/notifications.js
@@ -3,10 +3,42 @@
 /* global asyncForEach:false */
 /* global angular:false */
 
-angular.module('Application').controller('NotificationsController', ['$scope', 'Client', function ($scope, Client) {
+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');
+        },
+
+        waitForReboot: function () {
+            if (Client.offline) return $scope.reboot.busy = false; // at this point, we are showing the offline banner
+
+            Client.getStatus(function (error, status) {
+                if (error) return $timeout($scope.reboot.waitForReboot, 5000);
+
+                $scope.reboot.busy = false;
+            });
+        },
+
+        submit: function () {
+            $scope.reboot.busy = true;
+
+            Client.reboot(function (error) {
+                if (error) return Client.error(error);
+
+                $('#rebootModal').modal('hide');
+
+                // show "busy" indicator for 5 seconds to show some ui activity
+                $timeout(function () { $scope.reboot.waitForReboot(); }, 5000);
+            });
+        }
+    };
+
     $scope.notifications = {
         notifications: [],
         activeNotification: null,
diff --git a/src/views/system.html b/src/views/system.html
index 2031b9a4f..1f63d72c2 100644
--- a/src/views/system.html
+++ b/src/views/system.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>
-
 <!-- Modal service configure -->
 <div class="modal fade" id="serviceConfigureModal" tabindex="-1" role="dialog">
   <div class="modal-dialog">