diff --git a/src/octoprint/templates/dialogs/settings/server.jinja2 b/src/octoprint/templates/dialogs/settings/server.jinja2
index 09bee222..4999a666 100644
--- a/src/octoprint/templates/dialogs/settings/server.jinja2
+++ b/src/octoprint/templates/dialogs/settings/server.jinja2
@@ -1,20 +1,22 @@
 <form class="form-horizontal">
-    <div class="control-group">
-        <label class="control-label" for="settings-systemShutdownCommand">{{ _('System Shutdown Command') }}</label>
-        <div class="controls">
-            <input type="text" class="input-block-level" data-bind="value: server_commands_systemShutdownCommand" id="settings-systemShutdownCommand">
-        </div>
-    </div>
-    <div class="control-group">
-        <label class="control-label" for="settings-systemRestartCommand">{{ _('System Restart Command') }}</label>
-        <div class="controls">
-            <input type="text" class="input-block-level" data-bind="value: server_commands_systemRestartCommand" id="settings-systemRestartCommand">
-        </div>
-    </div>
-    <div class="control-group">
-        <label class="control-label" for="settings-serverRestartCommand">{{ _('Server Restart Command') }}</label>
+    <h3>Commands</h3>
+
+    <div class="control-group" title="{{ _('Command to restart the OctoPrint server') }}">
+        <label class="control-label" for="settings-serverRestartCommand">{{ _('Restart OctoPrint') }}</label>
         <div class="controls">
             <input type="text" class="input-block-level" data-bind="value: server_commands_serverRestartCommand" id="settings-serverRestartCommand">
         </div>
     </div>
+    <div class="control-group" title="{{ _('Command to restart the system OctoPrint is running on') }}">
+        <label class="control-label" for="settings-systemRestartCommand">{{ _('Restart system') }}</label>
+        <div class="controls">
+            <input type="text" class="input-block-level" data-bind="value: server_commands_systemRestartCommand" id="settings-systemRestartCommand">
+        </div>
+    </div>
+    <div class="control-group" title="{{ _('Command to shut down the system OctoPrint is running on') }}">
+        <label class="control-label" for="settings-systemShutdownCommand">{{ _('Shutdown system') }}</label>
+        <div class="controls">
+            <input type="text" class="input-block-level" data-bind="value: server_commands_systemShutdownCommand" id="settings-systemShutdownCommand">
+        </div>
+    </div>
 </form>