diff --git a/src/ui/combobox.cpp b/src/ui/combobox.cpp
index 2244d2983..a2ee62e86 100644
--- a/src/ui/combobox.cpp
+++ b/src/ui/combobox.cpp
@@ -436,7 +436,9 @@ bool ComboBoxEntry::onProcessMessage(Message* msg)
       break;
 
     case kMouseDownMessage:
-      if (m_comboBox->isClickOpen()) {
+      if (m_comboBox->isClickOpen() &&
+          (!m_comboBox->isEditable() ||
+           !m_comboBox->m_items.empty())) {
         m_comboBox->switchListBox();
       }