diff --git a/src/openflexure_microscope_server/things/system.py b/src/openflexure_microscope_server/things/system.py
index bd3f23f9..831cad8d 100644
--- a/src/openflexure_microscope_server/things/system.py
+++ b/src/openflexure_microscope_server/things/system.py
@@ -10,6 +10,8 @@ from typing import Optional
 from uuid import UUID, uuid4
 import subprocess
 import os
+from signal import SIGTERM
+import time
 
 from pydantic import BaseModel
 
@@ -80,6 +82,16 @@ class OpenFlexureSystem(lt.Thing):
     @lt.thing_action
     def shutdown(self) -> CommandOutput:
         """Attempt to shutdown the device."""
+        if not self.is_raspberrypi:
+            os.kill(os.getpid(), SIGTERM)
+            time.sleep(0.5)
+            # If this line is reached then the server did not shut down!
+            return CommandOutput(
+                output="",
+                error="Shutdown command sent to server process, but the server has not shutdown.",
+            )
+
+        # On a Raspberry Pi
         p = subprocess.Popen(
             ["sudo", "shutdown", "-h", "now"],
             stderr=subprocess.PIPE,
@@ -92,6 +104,12 @@ class OpenFlexureSystem(lt.Thing):
     @lt.thing_action
     def reboot(self) -> CommandOutput:
         """Attempt to reboot the device."""
+        if not self.is_raspberrypi:
+            return CommandOutput(
+                output="",
+                error="Restart is only available on Raspberry Pi.",
+            )
+
         p = subprocess.Popen(
             ["sudo", "shutdown", "-r", "now"],
             stderr=subprocess.PIPE,
diff --git a/webapp/src/components/tabContentComponents/powerContent.vue b/webapp/src/components/tabContentComponents/powerContent.vue
index b442a796..a865e74f 100644
--- a/webapp/src/components/tabContentComponents/powerContent.vue
+++ b/webapp/src/components/tabContentComponents/powerContent.vue
@@ -1,23 +1,23 @@
 <template>
   <!-- Grid managing tab content -->
-  <div class="center">
-  <h1 style="text-align: center;"> Power</h1>
-  <p style="text-align: center;"> It's essential to turn off your OpenFlexure Microscope here before unplugging it.
-  <br>
-  <br>
-  Unplugging the microscope unexpectedly can damage the SD card or onboard computer.
-  </p>
-    <div class="buttons">
+  <div class="container">
+    <h1 id="power-title"> Power</h1>
+    <p id="power-msg"> It's essential to turn off your OpenFlexure Microscope here before unplugging it.
+    <br>
+    <br>
+    Unplugging the microscope unexpectedly can damage the SD card or onboard computer.
+    </p>
+    <div class="buttons-container">
       <button
         v-show="'shutdown' in things.system.actions"
-        class="uk-button uk-button-primary uk-width-1-3"
+        class="uk-button uk-button-primary uk-width-1-3 shutdown-button"
         @click="systemRequest('shutdown')"
       >
         Shutdown
       </button>
       <button
-        v-show="'reboot' in things.system.actions"
-        class="uk-button uk-button-primary uk-width-1-3"
+        v-if="isRaspberrypi"
+        class="uk-button uk-button-primary uk-width-1-3 shutdown-button"
         @click="systemRequest('reboot')"
       >
         Restart
@@ -33,6 +33,12 @@ export default {
   name: "PowerContent",
 
   components: {},
+
+  data: function() {
+    return {
+      isRaspberrypi: undefined,
+    }
+  },
   
   computed: {
     things: function() {
@@ -40,8 +46,15 @@ export default {
     }
   },
 
+  async mounted() {
+    this.isRaspberrypi = await this.readThingProperty(
+      "system",
+      "is_raspberrypi"
+    );
+  },
+
   methods: {
-  systemRequest: function(action) {
+    systemRequest: function(action) {
       let message = "";
       if (action == "reboot") {
         message = "Restart microscope?"
@@ -69,14 +82,32 @@ export default {
 // Custom UIkit CSS modifications
 @import "../../assets/less/theme.less";
 
-.center {
-    right: 50%;
-    bottom: 50%;
-    transform: translate(50%,50%);
-    position: absolute;
+
+.container {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  padding: 2em;
+  box-sizing: border-box;
 }
 
-.uk-button {
+#power-title {
+  text-align: center;
+}
+
+#power-msg {
+  text-align: center;
+}
+
+.buttons-container {
+  width: 100%;
+  text-align: center;
+}
+
+.shutdown-button {
   display: inline;
   text-align:center;
   margin: 30px 30px 30px 30px;