diff --git a/src/gui/core/gui_definition.cpp b/src/gui/core/gui_definition.cpp
index 7f7a2c9dbd5..27c0cf81c46 100644
--- a/src/gui/core/gui_definition.cpp
+++ b/src/gui/core/gui_definition.cpp
@@ -228,7 +228,7 @@ resolution_definition_ptr get_control(const std::string& control_type, const std
 	auto control = find_definition(current_types);
 
 	// Definition not found in the current theme, try the default theme.
-	if(!control) {
+	if(!control && current_gui != default_gui) {
 		control = find_definition(default_types);
 	}