diff --git a/page/public/emulator-worker.js b/page/public/emulator-worker.js
index 77bad1f4..483f26ad 100644
--- a/page/public/emulator-worker.js
+++ b/page/public/emulator-worker.js
@@ -9,7 +9,7 @@ onmessage = async (event) => {
 
   switch (data.message) {
     case "run":
-      runEmulation(payload.file, payload.options);
+      runEmulation(payload.file, payload.options, payload.persist);
       break;
     case "event":
       msgQueue.push(payload);
@@ -38,10 +38,19 @@ function logLine(text) {
   }
 }
 
-function notifyExit(code) {
+function notifyExit(code, persist) {
   flushLines();
-  sendMessage("end", code);
-  self.close();
+
+  const finishExecution = () => {
+    sendMessage("end", code);
+    self.close();
+  };
+
+  if (persist) {
+    FS.syncfs(false, finishExecution);
+  } else {
+    finishExecution();
+  }
 }
 
 function handleMessage(message) {
@@ -56,7 +65,7 @@ function getMessageFromQueue() {
   return msgQueue.shift();
 }
 
-function runEmulation(file, options) {
+function runEmulation(file, options, persist) {
   const mainArguments = [...options, "-e", "./root", file];
 
   globalThis.Module = {
@@ -71,8 +80,8 @@ function runEmulation(file, options) {
     },
     print: logLine,
     printErr: logLine,
-    onAbort: () => notifyExit(null),
-    onExit: notifyExit,
+    onAbort: () => notifyExit(null, persist),
+    onExit: (code) => notifyExit(code, persist),
     postRun: flushLines,
   };
 
diff --git a/page/src/components/settings-menu.tsx b/page/src/components/settings-menu.tsx
index 06a0dac4..07ae18be 100644
--- a/page/src/components/settings-menu.tsx
+++ b/page/src/components/settings-menu.tsx
@@ -83,6 +83,17 @@ export class SettingsMenu extends React.Component<SettingsMenuProps, Settings> {
           />
           <Label htmlFor="settings-buffer">Buffer stdout</Label>
         </div>
+
+        <div className="flex gap-6">
+          <Checkbox
+            id="settings-persist"
+            checked={this.state.persist}
+            onCheckedChange={(checked: boolean) => {
+              this.setState({ persist: checked });
+            }}
+          />
+          <Label htmlFor="settings-persist">Persist filesystem</Label>
+        </div>
       </div>
     );
   }
diff --git a/page/src/emulator.ts b/page/src/emulator.ts
index f5844f92..4499b935 100644
--- a/page/src/emulator.ts
+++ b/page/src/emulator.ts
@@ -75,6 +75,7 @@ export class Emulator {
       data: {
         file,
         options: translateSettings(settings),
+        persist: settings.persist,
       },
     });
   }
diff --git a/page/src/playground.tsx b/page/src/playground.tsx
index 27736755..42ae12a0 100644
--- a/page/src/playground.tsx
+++ b/page/src/playground.tsx
@@ -105,13 +105,25 @@ export class Playground extends React.Component<
     location.reload();
   }
 
-  initFilesys() {
-    if (this.state.filesystemPromise) {
+  _onEmulatorStateChanged(s: EmulationState, persistFs: boolean) {
+    if (s == EmulationState.Stopped && persistFs) {
+      this.setState({ filesystemPromise: null, filesystem: null });
+      this.initFilesys(true);
+    } else {
+      this.forceUpdate();
+    }
+  }
+
+  initFilesys(force: boolean = false) {
+    if (!force && this.state.filesystemPromise) {
       return this.state.filesystemPromise;
     }
 
     const promise = new Promise<Filesystem>((resolve) => {
-      this.logLine("Loading filesystem...");
+      if (!force) {
+        this.logLine("Loading filesystem...");
+      }
+
       setupFilesystem(
         (current, total, file) => {
           this.logLine(`Processing filesystem (${current}/${total}): ${file}`);
@@ -172,9 +184,11 @@ export class Playground extends React.Component<
       await this.state.filesystemPromise;
     }
 
+    const persistFs = this.state.settings.persist;
+
     const new_emulator = new Emulator(
       (l) => this.logLines(l),
-      (_) => this.forceUpdate(),
+      (s) => this._onEmulatorStateChanged(s, persistFs),
     );
     new_emulator.onTerminate().then(() => this.setState({ emulator: null }));
 
diff --git a/page/src/settings.ts b/page/src/settings.ts
index 1b733acf..b12fc819 100644
--- a/page/src/settings.ts
+++ b/page/src/settings.ts
@@ -3,6 +3,7 @@ export interface Settings {
   concise: boolean;
   silent: boolean;
   bufferStdout: boolean;
+  persist: boolean;
 }
 
 export function createDefaultSettings(): Settings {
@@ -11,6 +12,7 @@ export function createDefaultSettings(): Settings {
     concise: false,
     silent: false,
     bufferStdout: true,
+    persist: false,
   };
 }