--- old/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java	2014-05-14 18:09:59.000000000 +0400
+++ new/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java	2014-05-14 18:09:58.000000000 +0400
@@ -522,15 +522,17 @@
     };
 
     @SuppressWarnings("serial") // anonymous class
-    private static Action hideAction = new AbstractAction() {
+    private final Action hideAction = new AbstractAction() {
         @Override
         public void actionPerformed(final ActionEvent e) {
             final JComboBox comboBox = (JComboBox)e.getSource();
+            comboBox.firePopupMenuCanceled();
+            comboBox.setPopupVisible(false);
+        }
 
-            if (comboBox.isPopupVisible()) {
-                comboBox.firePopupMenuCanceled();
-                comboBox.setPopupVisible(false);
-            }
+        @Override
+        public boolean isEnabled() {
+            return comboBox.isPopupVisible() && super.isEnabled();
         }
     };