diff --git a/src/main/menu.ts b/src/main/menu.ts
index 4330c58..25fb93c 100644
--- a/src/main/menu.ts
+++ b/src/main/menu.ts
@@ -137,7 +137,6 @@ async function createMenu({ isRunning } = { isRunning: false }) {
         {
           label: "Start without state",
           click: () => send(IPC_COMMANDS.MACHINE_BOOT_FROM_SCRATCH),
-          enabled: !isRunning,
         },
         {
           label: "Restart",
diff --git a/src/renderer/emulator.tsx b/src/renderer/emulator.tsx
index d9f40cf..25d7d87 100644
--- a/src/renderer/emulator.tsx
+++ b/src/renderer/emulator.tsx
@@ -314,7 +314,8 @@ export class Emulator extends React.Component<{}, EmulatorState> {
   /**
    * Boot the emulator without restoring state
    */
-  public bootFromScratch() {
+  public async bootFromScratch() {
+    await this.stopEmulator();
     this.setState({ isBootingFresh: true });
     this.startEmulator();
   }