diff --git a/ajax/system/sys_actions.php b/ajax/system/sys_actions.php
new file mode 100644
index 00000000..ec7aef16
--- /dev/null
+++ b/ajax/system/sys_actions.php
@@ -0,0 +1,21 @@
+<?php
+
+require '../../includes/csrf.php';
+
+$action = escapeshellcmd($_POST['a']);
+
+if (isset($action)) {
+
+    switch($action) {
+    case "reboot":
+        $response = shell_exec("sudo /sbin/reboot");
+        break;
+    case "shutdown":
+        $response = shell_exec("sudo /sbin/shutdown -h now");
+        break;
+    default:
+        $response = 'Unknown action: '.$action;
+    }
+    echo json_encode($response);
+}
+
diff --git a/app/js/custom.js b/app/js/custom.js
index baa34c7a..e7ec3b45 100644
--- a/app/js/custom.js
+++ b/app/js/custom.js
@@ -354,6 +354,15 @@ $('#js-system-reset-confirm').on('click', function (e) {
     });
 });
 
+$('#js-sys-reboot, #js-sys-shutdown').on('click', function (e) {
+    e.preventDefault();
+    var csrfToken = $('meta[name=csrf_token]').attr('content');
+    var action = $(this).data('action');
+    $.post('ajax/system/sys_actions.php?',{'a': action, 'csrf_token': csrfToken},function(data){
+        var response = JSON.parse(data);
+    });
+});
+
 $(document).ready(function(){
   $("#PanelManual").hide();
 });
diff --git a/includes/system.php b/includes/system.php
index b9072c45..ddc462c5 100755
--- a/includes/system.php
+++ b/includes/system.php
@@ -47,15 +47,6 @@ function DisplaySystem(&$extraFooterScripts)
                 }
             }
         }
-
-        if (isset($_POST['system_reboot'])) {
-            $status->addMessage("System Rebooting Now!", "warning", false);
-            $result = shell_exec("sudo /sbin/reboot");
-        }
-        if (isset($_POST['system_shutdown'])) {
-            $status->addMessage("System Shutting Down Now!", "warning", false);
-            $result = shell_exec("sudo /sbin/shutdown -h now");
-        }
     }
 
     if (isset($_POST['RestartLighttpd'])) {
diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo
index c7daa31f..ae9de85f 100644
Binary files a/locale/en_US/LC_MESSAGES/messages.mo and b/locale/en_US/LC_MESSAGES/messages.mo differ
diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po
index 0b72060b..368341c4 100644
--- a/locale/en_US/LC_MESSAGES/messages.po
+++ b/locale/en_US/LC_MESSAGES/messages.po
@@ -752,6 +752,18 @@ msgstr "Reboot"
 msgid "Shutdown"
 msgstr "Shutdown"
 
+msgid "System reboot"
+msgstr "System reboot"
+
+msgid "System shutdown"
+msgstr "System shutdown"
+
+msgid "Reboot now? The system will be temporarily unavailable."
+msgstr "Reboot now? The system will be temporarily unavailable."
+
+msgid "Shutdown now? The system will be unavailable."
+msgstr "Shutdown now? The system will be unavailable."
+
 msgid "System Rebooting Now!"
 msgstr "System Rebooting Now!"
 
diff --git a/templates/system.php b/templates/system.php
index 65a3834e..cf390742 100755
--- a/templates/system.php
+++ b/templates/system.php
@@ -52,3 +52,39 @@
   </div>
 </div>
 
+<!-- modal confirm-reboot-->
+<div class="modal fade" id="system-confirm-reboot" tabindex="-1" role="dialog" aria-labelledby="ModalLabel" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <div class="modal-title" id="ModalLabel"><i class="fas fa-sync mr-2"></i><?php echo _("System reboot"); ?></div>
+      </div>
+      <div class="modal-body">
+        <div class="col-md-12 mb-3 mt-1" id="system-reboot-message"><?php echo _("Reboot now? The system will be temporarily unavailable."); ?></div>
+      </div>
+      <div class="modal-footer">
+      <button type="button" data-message="<?php echo _("Close"); ?>" class="btn btn-outline-secondary" data-dismiss="modal"><?php echo _("Cancel"); ?></button>
+      <button type="button" id="js-sys-reboot" data-action="reboot" class="btn btn-outline-danger btn-delete"><?php echo _("Reboot"); ?></button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- modal confirm-shutdown-->
+<div class="modal fade" id="system-confirm-shutdown" tabindex="-1" role="dialog" aria-labelledby="ModalLabel" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+      <div class="modal-title" id="ModalLabel"><i class="fas fa-power-off mr-2"></i><?php echo _("System shutdown"); ?></div>
+      </div>
+      <div class="modal-body">
+        <div class="col-md-12 mb-3 mt-1" id="system-reboot-message"><?php echo _("Shutdown now? The system will be unavailable."); ?></div>
+      </div>
+      <div class="modal-footer">
+      <button type="button" data-message="<?php echo _("Close"); ?>" class="btn btn-outline-secondary" data-dismiss="modal"><?php echo _("Cancel"); ?></button>
+      <button type="button" id="js-sys-shutdown" data-action="shutdown" class="btn btn-outline-danger btn-delete"><?php echo _("Shutdown"); ?></button>
+      </div>
+    </div>
+  </div>
+</div>
+
diff --git a/templates/system/basic.php b/templates/system/basic.php
index 81adb6d2..182a5bb1 100644
--- a/templates/system/basic.php
+++ b/templates/system/basic.php
@@ -55,8 +55,8 @@ include('includes/sysstats.php');
       <form action="system_info" method="POST">
         <?php echo CSRFTokenFieldTag() ?>
         <?php if (!RASPI_MONITOR_ENABLED) : ?>
-            <input type="submit" class="btn btn-warning" name="system_reboot"   value="<?php echo _("Reboot"); ?>" />
-            <input type="submit" class="btn btn-warning" name="system_shutdown" value="<?php echo _("Shutdown"); ?>" />
+            <input type="button" class="btn btn-warning" data-toggle="modal" data-target="#system-confirm-reboot" value="<?php echo _("Reboot"); ?>" />
+            <input type="button" class="btn btn-warning" data-toggle="modal" data-target="#system-confirm-shutdown" value="<?php echo _("Shutdown"); ?>" />
         <?php endif ?>
         <button type="button" onClick="window.location.reload();" class="btn btn-outline btn-primary"><i class="fas fa-sync-alt"></i> <?php echo _("Refresh") ?></a>
      </form>