diff --git a/packages/gpt-runner-web/client/src/styles/themes/index.ts b/packages/gpt-runner-web/client/src/styles/themes/index.ts
index d00b6e4..637aff6 100644
--- a/packages/gpt-runner-web/client/src/styles/themes/index.ts
+++ b/packages/gpt-runner-web/client/src/styles/themes/index.ts
@@ -1,3 +1,4 @@
+import { getGlobalConfig } from '../../helpers/global-config'
 import { gptrLightTheme } from './gptr-light.theme'
 import { gptrDarkTheme } from './gptr-dark.theme'
 import { jetbrainsDarkTheme } from './jetbrains-dark.theme'
@@ -17,6 +18,11 @@ export const themeMap = {
   jetbrainsLight: jetbrainsLightTheme,
 } as const
 
+if (getGlobalConfig().defaultTheme !== 'default') {
+  const defaultTheme = themeMap[getGlobalConfig().defaultTheme] || themeMap.default
+  ;(themeMap as any).default = defaultTheme
+}
+
 export function isDarkTheme(themeName: ThemeName) {
   const darkThemes: ThemeName[] = ['default', 'gptrDark', 'vscodeDynamic', 'vscodeDark', 'jetbrainsDark']
   return darkThemes.includes(themeName)