diff --git a/src/vs/gitpod/browser/workbench/workbench.ts b/src/vs/gitpod/browser/workbench/workbench.ts
index 8cdc9ad444ff2..784602140945c 100644
--- a/src/vs/gitpod/browser/workbench/workbench.ts
+++ b/src/vs/gitpod/browser/workbench/workbench.ts
@@ -833,6 +833,8 @@ async function doStart(): Promise<IDisposable> {
 		},
 		configurationDefaults: {
 			'workbench.colorTheme': 'Gitpod Light',
+			'workbench.preferredLightColorTheme': 'Gitpod Light',
+			'workbench.preferredDarkColorTheme': 'Gitpod Dark',
 		},
 		developmentOptions: {
 			logLevel: logLevel ? parseLogLevel(logLevel) : undefined