diff --git a/palimpsest/src/components/ThemePicker.svelte b/palimpsest/src/components/ThemePicker.svelte
index 95ea2c7a..4f4ed797 100644
--- a/palimpsest/src/components/ThemePicker.svelte
+++ b/palimpsest/src/components/ThemePicker.svelte
@@ -1,9 +1,26 @@
 <script>
   export let inline = false;
 
+  import { onMount, afterUpdate } from 'svelte';
   import { Select, SelectItem } from 'carbon-components-svelte';
   import { theme } from '../store';
 
+  onMount(() => {
+    let currentTheme = localStorage.getItem('theme');
+
+    if (currentTheme) {
+      theme.set(currentTheme);
+    } else {
+      if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
+        theme.set('g90');
+      }
+    }
+  });
+
+  afterUpdate(() => {
+    localStorage.setItem('theme', $theme);
+  });
+
   $: {
     document.documentElement.setAttribute('carbon-theme', $theme);
   }