diff --git a/Source/Core/Controls/DockersControl.cs b/Source/Core/Controls/DockersControl.cs
index 530061de..2e7cd739 100644
--- a/Source/Core/Controls/DockersControl.cs
+++ b/Source/Core/Controls/DockersControl.cs
@@ -87,7 +87,7 @@ namespace CodeImp.DoomBuilder.Controls
 				
 				// We have focus when we need the keyboard for input
 				// Otherwise we don't want the focus and the docker may collapse
-				return (ac is TextBox) || (ac is RichTextBox) || (ac is NumericUpDown);
+				return (ac is TextBox) || (ac is RichTextBox) || (ac is NumericUpDown) || (ac is ComboBox);
 			}
 		}