diff --git a/Editor/ContentBrowserWindow.cpp b/Editor/ContentBrowserWindow.cpp
index f7d206626..c18664831 100644
--- a/Editor/ContentBrowserWindow.cpp
+++ b/Editor/ContentBrowserWindow.cpp
@@ -338,8 +338,7 @@ void ContentBrowserWindow::SetSelection(SELECTION selection)
 			AddWidget(&x);
 		}
 
-		// Refresh theme:
-		editor->generalWnd.themeCombo.SetSelected(editor->generalWnd.themeCombo.GetSelected());
+		editor->generalWnd.RefreshTheme();
 
 	});
 }
diff --git a/Editor/Editor.cpp b/Editor/Editor.cpp
index f6824e94c..774c2845a 100644
--- a/Editor/Editor.cpp
+++ b/Editor/Editor.cpp
@@ -2998,6 +2998,8 @@ void EditorComponent::Update(float dt)
 	{
 		wi::renderer::SetToDrawDebugSprings(generalWnd.springVisCheckBox.GetCheck());
 	}
+
+	generalWnd.RefreshTheme();
 }
 void EditorComponent::PostUpdate()
 {
@@ -5908,7 +5910,7 @@ void EditorComponent::SetCurrentScene(int index)
 }
 void EditorComponent::RefreshSceneList()
 {
-	generalWnd.themeCombo.SetSelected(generalWnd.themeCombo.GetSelected());
+	generalWnd.RefreshTheme();
 	for (int i = 0; i < int(scenes.size()); ++i)
 	{
 		auto& editorscene = scenes[i];
diff --git a/Editor/GeneralWindow.cpp b/Editor/GeneralWindow.cpp
index 9e82d024f..d61ef26c7 100644
--- a/Editor/GeneralWindow.cpp
+++ b/Editor/GeneralWindow.cpp
@@ -196,7 +196,7 @@ void GeneralWindow::Create(EditorComponent* _editor)
 		editor->main->config.GetSection("options").Set("focus_mode", args.bValue);
 		// trigger themeCombo's OnSelect handler, which will enable/disable shadow highlighting
 		// according to this checkbox's state
-		themeCombo.SetSelected(themeCombo.GetSelected());
+		RefreshTheme();
 	});
 	AddWidget(&focusModeCheckBox);
 
@@ -1120,6 +1120,11 @@ void GeneralWindow::RefreshLanguageSelectionAfterWholeGUIWasInitialized()
 		}
 	}
 }
+
+void GeneralWindow::RefreshTheme()
+{
+	themeCombo.SetSelected(themeCombo.GetSelected());
+}
 void GeneralWindow::ReloadThemes()
 {
 	if (editor->main->config.GetSection("options").Has("theme"))
diff --git a/Editor/GeneralWindow.h b/Editor/GeneralWindow.h
index 2cc3c62b1..5570a4ada 100644
--- a/Editor/GeneralWindow.h
+++ b/Editor/GeneralWindow.h
@@ -52,6 +52,7 @@ public:
 
 	void RefreshLanguageSelectionAfterWholeGUIWasInitialized();
 
+	void RefreshTheme();
 	void ReloadThemes();
 };
 
diff --git a/Editor/HairParticleWindow.cpp b/Editor/HairParticleWindow.cpp
index dd639ce89..b7058fd0c 100644
--- a/Editor/HairParticleWindow.cpp
+++ b/Editor/HairParticleWindow.cpp
@@ -407,7 +407,7 @@ void HairParticleWindow::RefreshSprites()
 		AddWidget(&s);
 	}
 
-	editor->generalWnd.themeCombo.SetSelected(editor->generalWnd.themeCombo.GetSelected()); // theme callback
+	editor->generalWnd.RefreshTheme();
 }
 
 void HairParticleWindow::SetEntity(Entity entity)
diff --git a/Editor/LightWindow.cpp b/Editor/LightWindow.cpp
index ac1d3c619..db9ed28d9 100644
--- a/Editor/LightWindow.cpp
+++ b/Editor/LightWindow.cpp
@@ -518,8 +518,7 @@ void LightWindow::RefreshCascades()
 	AddWidget(&addCascadeButton);
 	addCascadeButton.SetEnabled(true);
 
-	// refresh theme:
-	editor->generalWnd.themeCombo.SetSelected(editor->generalWnd.themeCombo.GetSelected());
+	editor->generalWnd.RefreshTheme();
 
 }
 
diff --git a/Editor/MetadataWindow.cpp b/Editor/MetadataWindow.cpp
index 0fe59e3d0..2c1b1e33b 100644
--- a/Editor/MetadataWindow.cpp
+++ b/Editor/MetadataWindow.cpp
@@ -414,7 +414,7 @@ void MetadataWindow::RefreshEntries()
 		AddWidget(&entry.remove);
 	}
 
-	editor->generalWnd.themeCombo.SetSelected(editor->generalWnd.themeCombo.GetSelected());
+	editor->generalWnd.RefreshTheme();
 }
 
 void MetadataWindow::ResizeLayout()
diff --git a/Editor/SplineWindow.cpp b/Editor/SplineWindow.cpp
index 7c7f80dbb..a86cf814f 100644
--- a/Editor/SplineWindow.cpp
+++ b/Editor/SplineWindow.cpp
@@ -328,7 +328,7 @@ void SplineWindow::RefreshEntries()
 		AddWidget(&entry.removeButton);
 	}
 
-	editor->generalWnd.themeCombo.SetSelected(editor->generalWnd.themeCombo.GetSelected());
+	editor->generalWnd.RefreshTheme();
 }
 
 void SplineWindow::NewNode()
diff --git a/Editor/TerrainWindow.cpp b/Editor/TerrainWindow.cpp
index a4a129106..94b9c1ddb 100644
--- a/Editor/TerrainWindow.cpp
+++ b/Editor/TerrainWindow.cpp
@@ -531,7 +531,7 @@ void PropsWindow::AddWindow(wi::terrain::Prop& prop)
 
 	windows.emplace_back().reset(wnd);
 
-	editor->generalWnd.themeCombo.SetSelected(editor->generalWnd.themeCombo.GetSelected()); // theme refresh
+	editor->generalWnd.RefreshTheme();
 }
 
 void PropsWindow::Update(const wi::Canvas& canvas, float dt)
@@ -1398,7 +1398,7 @@ void TerrainWindow::AddModifier(ModifierWindow* modifier_window)
 		modifiers_to_remove.push_back(modifier_window);
 		});
 
-	editor->generalWnd.themeCombo.SetSelected(editor->generalWnd.themeCombo.GetSelected()); // theme refresh
+	editor->generalWnd.RefreshTheme();
 }
 void TerrainWindow::SetupAssets()
 {