diff --git a/packages/cli/src/ui/components/ThemeDialog.tsx b/packages/cli/src/ui/components/ThemeDialog.tsx
index 72b43bae71..67e1b5e532 100644
--- a/packages/cli/src/ui/components/ThemeDialog.tsx
+++ b/packages/cli/src/ui/components/ThemeDialog.tsx
@@ -281,10 +281,6 @@ export function ThemeDialog({
   const codeBlockHeight = Math.ceil(availableHeightForPanes * 0.6);
   const diffHeight = Math.floor(availableHeightForPanes * 0.4);
 
-  const previewTheme =
-    themeManager.getTheme(highlightedThemeName || DEFAULT_THEME.name) ||
-    DEFAULT_THEME;
-
   return (
     <Box
       borderStyle="round"
@@ -425,7 +421,9 @@ def fibonacci(n):
     return a`,
                       language: 'python',
                       availableHeight:
-                        isAlternateBuffer === false ? codeBlockHeight : undefined,
+                        isAlternateBuffer === false
+                          ? codeBlockHeight
+                          : undefined,
                       maxWidth: colorizeCodeWidth,
                       settings,
                       theme: previewTheme,
diff --git a/packages/cli/src/ui/hooks/useTerminalTheme.test.tsx b/packages/cli/src/ui/hooks/useTerminalTheme.test.tsx
index b101e757cb..2d6b96538d 100644
--- a/packages/cli/src/ui/hooks/useTerminalTheme.test.tsx
+++ b/packages/cli/src/ui/hooks/useTerminalTheme.test.tsx
@@ -199,7 +199,7 @@ describe('useTerminalTheme', () => {
     config.setTerminalBackground('#000000');
     vi.mocked(config.setTerminalBackground).mockClear();
     // But theme is light
-    mockSettings.merged.ui.theme = 'default-light';
+    mockSettings.merged.ui.themeLight = 'default-light';
 
     const refreshStatic = vi.fn();
     const { unmount } = renderHook(() =>
@@ -220,7 +220,7 @@ describe('useTerminalTheme', () => {
       expect.anything(),
     );
 
-    mockSettings.merged.ui.theme = 'default';
+    mockSettings.merged.ui.themeDark = 'default';
     unmount();
   });