diff --git a/src/gui/combobox.cpp b/src/gui/combobox.cpp
index 589adbdb0..ae50e85dc 100644
--- a/src/gui/combobox.cpp
+++ b/src/gui/combobox.cpp
@@ -18,7 +18,9 @@ using namespace gfx;
 class ComboBoxButton : public Button
 {
 public:
-  ComboBoxButton() : Button("") { }
+  ComboBoxButton() : Button("") {
+    setFocusStop(false);
+  }
 
   void onPaint(PaintEvent& ev) OVERRIDE {
     getTheme()->paintComboBoxButton(ev);