diff --git a/web/ajax/modals/shutdown.php b/web/ajax/modals/shutdown.php
new file mode 100644
index 000000000..0cfea0111
--- /dev/null
+++ b/web/ajax/modals/shutdown.php
@@ -0,0 +1,64 @@
+<?php
+$error='';
+
+if ( !canEdit('System') ) {
+  $error = 'Insufficient permissions';
+} else if ( !defined('ZM_PATH_SHUTDOWN') or ZM_PATH_SHUTDOWN == '' ) {
+  $error = 'ZM_PATH_SHUTDOWN is not defined. This is normally configured in /etc/zm/conf.d/01-system-paths.conf';
+} else if ( !file_exists(ZM_PATH_SHUTDOWN) ) {
+  $error = 'Path does not exist for ZM_PATH_SHUTDOWN. Current value is '.ZM_PATH_SHUTDOWN;
+}
+
+if ( $error ) {
+  ZM\Error($error);
+  return;
+}
+
+$output_str = '';
+if ( isset($output) ) {
+  $output_str = '<p>'.implode('<br/>', $output).'</p>'.PHP_EOL;
+}
+
+$cancel_str = '';
+if ( isset($_POST['when']) and ($_POST['when'] != 'NOW') and ($action != 'cancel') ) {
+  $cancel_str = '<p>You may cancel this shutdown by clicking '.translate('Cancel').'</p>'.PHP_EOL;
+}
+
+$cancel_btn = '';
+if ( isset($_POST['when']) and ($_POST['when'] != 'NOW') and ($action != 'cancel') ) {
+          $cancel_btn = '<button type="submit" class="btn btn-primary" name="action" value="cancel">' .translate('Cancel'). '</button>'.PHP_EOL;
+}
+
+?>
+<div class="modal" id="shutdownModal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('Shutdown').' '.translate('Restart') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+      <form name="contentForm" id="contentForm" method="post" action="?">
+        <input type="hidden" name="view" value="shutdown"/>
+        <?php echo $output_str ?>
+        <?php echo $cancel_str ?>
+        <p class="warning"><h2>Warning</h2>
+          This command will either shutdown or restart all ZoneMinder Servers<br/>
+        </p>
+        <p>
+          <input type="radio" name="when" value="now" id="whennow"/><label for="whennow">Now</label>
+          <input type="radio" name="when" value="1min" id="when1min" checked="checked"/><label for="when1min">1 Minute</label>
+        </p>
+      </div>
+      <div class="modal-footer">
+        <?php echo $cancel_btn ?>
+        <button type="submit" class="btn btn-primary" name="action" value="restart"><?php echo translate('Restart') ?></button>
+        <button type="submit" class="btn btn-primary" name="action" value="shutdown"><?php echo translate('Shutdown') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Close') ?></button>
+      </div>
+    </form>
+    </div>
+  </div>
+</div>
diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index dc97e295a..70bb8d163 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -756,9 +756,9 @@ function getStatusBtnHTML($status) {
     //$result .= '</li>'.PHP_EOL;
 
     if ( ZM_SYSTEM_SHUTDOWN ) {
-      $result .= '<p class="navbar-text">'.PHP_EOL;
-      $result .= makePopupLink('?view=shutdown', 'zmShutdown', 'shutdown', '<i class="material-icons md-18">power_settings_new</i>' ).PHP_EOL;
-      $result .= '</p>'.PHP_EOL;
+      $result .= '<div class="navbar-text pr-2 align-self-center">'.PHP_EOL;
+      $result .= '<button class="btn btn-outline" data-on-click="getShutdownModal" data-toggle="tooltip" data-placement="top" title="' .translate("Shutdown"). '" ><i class="material-icons md-18">power_settings_new</i></button>'.PHP_EOL;
+      $result .= '</div>'.PHP_EOL;
      } 
 
   } else if ( canView('System') ) {
diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js
index a7781b961..df2d45a7e 100644
--- a/web/skins/classic/js/skin.js
+++ b/web/skins/classic/js/skin.js
@@ -956,3 +956,18 @@ function exportEvent() {
       .fail(logAjaxFail);
   $j('#exportProgress').removeClass( 'invisible' );
 }
+
+// Load the Function modal on page load
+function getShutdownModal() {
+  $j.getJSON(thisUrl + '?request=modal&modal=shutdown')
+      .done(function(data) {
+        if ( $j('#shutdownModal').length ) {
+          $j('#shutdownModal').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        // Manage the Shutdown modal
+        $j('#shutdownModal').modal('show');
+      })
+      .fail(logAjaxFail);
+}