diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SmartComboBox.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SmartComboBox.java
index eac7f63f2..7a1d1cf88 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SmartComboBox.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SmartComboBox.java
@@ -211,9 +211,12 @@ protected void handleChange()
             }
             
             ((FilterableComboBoxModel) getModel()).setFilter(filter);
-            // A bit nasty but it seems to get the popup validated properly
+            
             setPopupVisible(false);
-            setPopupVisible(true);
+            
+            if(getModel().getSize() > 0)
+                setPopupVisible(true);
+            
             filtering = false;
         }
     }