diff --git a/ui/desktop/src/App.tsx b/ui/desktop/src/App.tsx
index 084ef85825..9170e4f526 100644
--- a/ui/desktop/src/App.tsx
+++ b/ui/desktop/src/App.tsx
@@ -33,6 +33,7 @@ import LauncherView from './components/LauncherView';
 import 'react-toastify/dist/ReactToastify.css';
 import { useConfig } from './components/ConfigContext';
 import { ModelAndProviderProvider } from './components/ModelAndProviderContext';
+import { ThemeProvider } from './contexts/ThemeContext';
 import PermissionSettingsView from './components/settings/permission/PermissionSetting';
 
 import ExtensionsView, { ExtensionsViewOptions } from './components/extensions/ExtensionsView';
@@ -555,47 +556,6 @@ export function AppInner() {
     };
   }, []);
 
-  useEffect(() => {
-    if (!window.electron) return;
-
-    const handleThemeChanged = (_event: unknown, ...args: unknown[]) => {
-      const themeData = args[0] as { mode: string; useSystemTheme: boolean; theme: string };
-
-      if (themeData.useSystemTheme) {
-        localStorage.setItem('use_system_theme', 'true');
-      } else {
-        localStorage.setItem('use_system_theme', 'false');
-        localStorage.setItem('theme', themeData.theme);
-      }
-
-      const isDark = themeData.useSystemTheme
-        ? window.matchMedia('(prefers-color-scheme: dark)').matches
-        : themeData.mode === 'dark';
-
-      if (isDark) {
-        document.documentElement.classList.add('dark');
-        document.documentElement.classList.remove('light');
-      } else {
-        document.documentElement.classList.remove('dark');
-        document.documentElement.classList.add('light');
-      }
-
-      const storageEvent = new Event('storage') as Event & {
-        key: string | null;
-        newValue: string | null;
-      };
-      storageEvent.key = themeData.useSystemTheme ? 'use_system_theme' : 'theme';
-      storageEvent.newValue = themeData.useSystemTheme ? 'true' : themeData.theme;
-      window.dispatchEvent(storageEvent);
-    };
-
-    window.electron.on('theme-changed', handleThemeChanged);
-
-    return () => {
-      window.electron.off('theme-changed', handleThemeChanged);
-    };
-  }, []);
-
   // Handle initial message from launcher
   useEffect(() => {
     const handleSetInitialMessage = (_event: IpcRendererEvent, ...args: unknown[]) => {
@@ -707,12 +667,14 @@ export function AppInner() {
 
 export default function App() {
   return (
-    <ModelAndProviderProvider>
-      <HashRouter>
-        <AppInner />
-      </HashRouter>
-      <AnnouncementModal />
-      <TelemetryOptOutModal controlled={false} />
-    </ModelAndProviderProvider>
+    <ThemeProvider>
+      <ModelAndProviderProvider>
+        <HashRouter>
+          <AppInner />
+        </HashRouter>
+        <AnnouncementModal />
+        <TelemetryOptOutModal controlled={false} />
+      </ModelAndProviderProvider>
+    </ThemeProvider>
   );
 }
diff --git a/ui/desktop/src/components/GooseSidebar/ThemeSelector.tsx b/ui/desktop/src/components/GooseSidebar/ThemeSelector.tsx
index 7fd1d438f9..1b2d22a728 100644
--- a/ui/desktop/src/components/GooseSidebar/ThemeSelector.tsx
+++ b/ui/desktop/src/components/GooseSidebar/ThemeSelector.tsx
@@ -1,6 +1,7 @@
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import { Moon, Sliders, Sun } from 'lucide-react';
 import { Button } from '../ui/button';
+import { useTheme } from '../../contexts/ThemeContext';
 
 interface ThemeSelectorProps {
   className?: string;
@@ -8,98 +9,12 @@ interface ThemeSelectorProps {
   horizontal?: boolean;
 }
 
-const getIsDarkMode = (mode: 'light' | 'dark' | 'system'): boolean => {
-  if (mode === 'system') {
-    return window.matchMedia('(prefers-color-scheme: dark)').matches;
-  }
-  return mode === 'dark';
-};
-
-const getThemeMode = (): 'light' | 'dark' | 'system' => {
-  const savedUseSystemTheme = localStorage.getItem('use_system_theme');
-  if (savedUseSystemTheme === 'true') {
-    return 'system';
-  }
-
-  const savedTheme = localStorage.getItem('theme');
-  if (savedTheme) {
-    return savedTheme === 'dark' ? 'dark' : 'light';
-  }
-
-  return getIsDarkMode('system') ? 'dark' : 'light';
-};
-
-const setThemeModeStorage = (mode: 'light' | 'dark' | 'system') => {
-  if (mode === 'system') {
-    localStorage.setItem('use_system_theme', 'true');
-  } else {
-    localStorage.setItem('use_system_theme', 'false');
-    localStorage.setItem('theme', mode);
-  }
-
-  const themeData = {
-    mode,
-    useSystemTheme: mode === 'system',
-    theme: mode === 'system' ? '' : mode,
-  };
-
-  window.electron?.broadcastThemeChange(themeData);
-};
-
 const ThemeSelector: React.FC<ThemeSelectorProps> = ({
   className = '',
   hideTitle = false,
   horizontal = false,
 }) => {
-  const [themeMode, setThemeMode] = useState<'light' | 'dark' | 'system'>(getThemeMode);
-  const [isDarkMode, setDarkMode] = useState(() => getIsDarkMode(getThemeMode()));
-
-  useEffect(() => {
-    const handleStorageChange = (e: { key: string | null; newValue: string | null }) => {
-      if (e.key === 'use_system_theme' || e.key === 'theme') {
-        const newThemeMode = getThemeMode();
-        setThemeMode(newThemeMode);
-        setDarkMode(getIsDarkMode(newThemeMode));
-      }
-    };
-
-    window.addEventListener('storage', handleStorageChange);
-
-    return () => {
-      window.removeEventListener('storage', handleStorageChange);
-    };
-  }, []);
-
-  useEffect(() => {
-    const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
-
-    const handleThemeChange = (e: { matches: boolean }) => {
-      if (themeMode === 'system') {
-        setDarkMode(e.matches);
-      }
-    };
-
-    mediaQuery.addEventListener('change', handleThemeChange);
-
-    setThemeModeStorage(themeMode);
-    setDarkMode(getIsDarkMode(themeMode));
-
-    return () => mediaQuery.removeEventListener('change', handleThemeChange);
-  }, [themeMode]);
-
-  useEffect(() => {
-    if (isDarkMode) {
-      document.documentElement.classList.add('dark');
-      document.documentElement.classList.remove('light');
-    } else {
-      document.documentElement.classList.remove('dark');
-      document.documentElement.classList.add('light');
-    }
-  }, [isDarkMode]);
-
-  const handleThemeChange = (newTheme: 'light' | 'dark' | 'system') => {
-    setThemeMode(newTheme);
-  };
+  const { userThemePreference, setUserThemePreference } = useTheme();
 
   return (
     <div className={`${!horizontal ? 'px-1 py-2 space-y-2' : ''} ${className}`}>
@@ -109,9 +24,9 @@ const ThemeSelector: React.FC<ThemeSelectorProps> = ({
       >
         <Button
           data-testid="light-mode-button"
-          onClick={() => handleThemeChange('light')}
+          onClick={() => setUserThemePreference('light')}
           className={`flex items-center justify-center gap-1 p-2 rounded-md border transition-colors text-xs ${
-            themeMode === 'light'
+            userThemePreference === 'light'
               ? 'bg-background-accent text-text-on-accent border-border-accent hover:!bg-background-accent hover:!text-text-on-accent'
               : 'border-border-default hover:!bg-background-muted text-text-muted hover:text-text-default'
           }`}
@@ -124,9 +39,9 @@ const ThemeSelector: React.FC<ThemeSelectorProps> = ({
 
         <Button
           data-testid="dark-mode-button"
-          onClick={() => handleThemeChange('dark')}
+          onClick={() => setUserThemePreference('dark')}
           className={`flex items-center justify-center gap-1 p-2 rounded-md border transition-colors text-xs ${
-            themeMode === 'dark'
+            userThemePreference === 'dark'
               ? 'bg-background-accent text-text-on-accent border-border-accent hover:!bg-background-accent hover:!text-text-on-accent'
               : 'border-border-default hover:!bg-background-muted text-text-muted hover:text-text-default'
           }`}
@@ -139,9 +54,9 @@ const ThemeSelector: React.FC<ThemeSelectorProps> = ({
 
         <Button
           data-testid="system-mode-button"
-          onClick={() => handleThemeChange('system')}
+          onClick={() => setUserThemePreference('system')}
           className={`flex items-center justify-center gap-1 p-2 rounded-md border transition-colors text-xs ${
-            themeMode === 'system'
+            userThemePreference === 'system'
               ? 'bg-background-accent text-text-on-accent border-border-accent hover:!bg-background-accent hover:!text-text-on-accent'
               : 'border-border-default hover:!bg-background-muted text-text-muted hover:text-text-default'
           }`}
diff --git a/ui/desktop/src/components/MCPUIResourceRenderer.tsx b/ui/desktop/src/components/MCPUIResourceRenderer.tsx
index e0322da7b6..438c0c4bc0 100644
--- a/ui/desktop/src/components/MCPUIResourceRenderer.tsx
+++ b/ui/desktop/src/components/MCPUIResourceRenderer.tsx
@@ -10,6 +10,7 @@ import {
 import { useState, useEffect } from 'react';
 import { toast } from 'react-toastify';
 import { EmbeddedResource } from '../api';
+import { useTheme } from '../contexts/ThemeContext';
 
 interface MCPUIResourceRendererProps {
   content: EmbeddedResource & { type: 'resource' };
@@ -91,13 +92,10 @@ export default function MCPUIResourceRenderer({
   content,
   appendPromptToChat,
 }: MCPUIResourceRendererProps) {
-  const [currentThemeValue, setCurrentThemeValue] = useState<string>('light');
+  const { resolvedTheme } = useTheme();
   const [proxyUrl, setProxyUrl] = useState<string | undefined>(undefined);
 
   useEffect(() => {
-    const theme = localStorage.getItem('theme') || 'light';
-    setCurrentThemeValue(theme);
-
     const fetchProxyUrl = async () => {
       try {
         const gooseApiHost = await window.electron.getGoosedHostPort();
@@ -124,7 +122,7 @@ export default function MCPUIResourceRenderer({
     ): Promise<UIActionHandlerResult> => {
       const { toolName, params } = actionEvent.payload;
       toast.info(<ToastComponent messageType="tool" message={toolName} isImplemented={false} />, {
-        theme: currentThemeValue,
+        theme: resolvedTheme,
       });
       return {
         status: 'error' as const,
@@ -232,7 +230,7 @@ export default function MCPUIResourceRenderer({
       const { message } = actionEvent.payload;
 
       toast.info(<ToastComponent messageType="notify" message={message} isImplemented={true} />, {
-        theme: currentThemeValue,
+        theme: resolvedTheme,
       });
       return {
         status: 'success' as const,
@@ -254,7 +252,7 @@ export default function MCPUIResourceRenderer({
           isImplemented={false}
         />,
         {
-          theme: currentThemeValue,
+          theme: resolvedTheme,
         }
       );
       return {
@@ -334,7 +332,7 @@ export default function MCPUIResourceRenderer({
               // MCP-UIs might find stuff like host and theme for conditional rendering
               // usage of this is experimental, leaving in place for demos
               host: 'goose',
-              theme: currentThemeValue,
+              theme: resolvedTheme,
             },
             proxy: proxyUrl, // refer to https://mcpui.dev/guide/client/using-a-proxy
           }}
diff --git a/ui/desktop/src/contexts/ThemeContext.tsx b/ui/desktop/src/contexts/ThemeContext.tsx
new file mode 100644
index 0000000000..982545e4dd
--- /dev/null
+++ b/ui/desktop/src/contexts/ThemeContext.tsx
@@ -0,0 +1,137 @@
+import React, { createContext, useContext, useEffect, useState, useCallback } from 'react';
+
+type ThemePreference = 'light' | 'dark' | 'system';
+type ResolvedTheme = 'light' | 'dark';
+
+interface ThemeContextValue {
+  userThemePreference: ThemePreference;
+  setUserThemePreference: (pref: ThemePreference) => void;
+  resolvedTheme: ResolvedTheme;
+}
+
+const ThemeContext = createContext<ThemeContextValue | null>(null);
+
+function getSystemTheme(): ResolvedTheme {
+  return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
+}
+
+function resolveTheme(preference: ThemePreference): ResolvedTheme {
+  if (preference === 'system') {
+    return getSystemTheme();
+  }
+  return preference;
+}
+
+function loadThemePreference(): ThemePreference {
+  const useSystemTheme = localStorage.getItem('use_system_theme');
+  if (useSystemTheme === 'true') {
+    return 'system';
+  }
+
+  const savedTheme = localStorage.getItem('theme');
+  if (savedTheme === 'dark') {
+    return 'dark';
+  }
+
+  return 'light';
+}
+
+function saveThemePreference(preference: ThemePreference): void {
+  if (preference === 'system') {
+    localStorage.setItem('use_system_theme', 'true');
+  } else {
+    localStorage.setItem('use_system_theme', 'false');
+    localStorage.setItem('theme', preference);
+  }
+}
+
+function applyThemeToDocument(theme: ResolvedTheme): void {
+  const toRemove = theme === 'dark' ? 'light' : 'dark';
+  document.documentElement.classList.add(theme);
+  document.documentElement.classList.remove(toRemove);
+}
+
+interface ThemeProviderProps {
+  children: React.ReactNode;
+}
+
+export function ThemeProvider({ children }: ThemeProviderProps) {
+  const [userThemePreference, setUserThemePreferenceState] =
+    useState<ThemePreference>(loadThemePreference);
+  const [resolvedTheme, setResolvedTheme] = useState<ResolvedTheme>(() =>
+    resolveTheme(loadThemePreference())
+  );
+
+  const setUserThemePreference = useCallback((preference: ThemePreference) => {
+    setUserThemePreferenceState(preference);
+    saveThemePreference(preference);
+
+    const resolved = resolveTheme(preference);
+    setResolvedTheme(resolved);
+
+    // Broadcast to other windows via Electron
+    window.electron?.broadcastThemeChange({
+      mode: resolved,
+      useSystemTheme: preference === 'system',
+      theme: resolved,
+    });
+  }, []);
+
+  // Listen for system theme changes when preference is 'system'
+  useEffect(() => {
+    if (userThemePreference !== 'system') return;
+
+    const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
+
+    const handleChange = () => {
+      setResolvedTheme(getSystemTheme());
+    };
+
+    mediaQuery.addEventListener('change', handleChange);
+    return () => mediaQuery.removeEventListener('change', handleChange);
+  }, [userThemePreference]);
+
+  // Listen for theme changes from other windows (via Electron IPC)
+  useEffect(() => {
+    if (!window.electron) return;
+
+    const handleThemeChanged = (_event: unknown, ...args: unknown[]) => {
+      const themeData = args[0] as { useSystemTheme: boolean; theme: string };
+      const newPreference: ThemePreference = themeData.useSystemTheme
+        ? 'system'
+        : themeData.theme === 'dark'
+          ? 'dark'
+          : 'light';
+
+      setUserThemePreferenceState(newPreference);
+      saveThemePreference(newPreference);
+      setResolvedTheme(resolveTheme(newPreference));
+    };
+
+    window.electron.on('theme-changed', handleThemeChanged);
+    return () => {
+      window.electron.off('theme-changed', handleThemeChanged);
+    };
+  }, []);
+
+  // Apply theme to document whenever resolvedTheme changes
+  useEffect(() => {
+    applyThemeToDocument(resolvedTheme);
+  }, [resolvedTheme]);
+
+  const value: ThemeContextValue = {
+    userThemePreference,
+    setUserThemePreference,
+    resolvedTheme,
+  };
+
+  return <ThemeContext.Provider value={value}>{children}</ThemeContext.Provider>;
+}
+
+export function useTheme(): ThemeContextValue {
+  const context = useContext(ThemeContext);
+  if (!context) {
+    throw new Error('useTheme must be used within a ThemeProvider');
+  }
+  return context;
+}