--- old/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java	2016-06-30 13:55:37.402023800 -0500
+++ new/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java	2016-06-30 13:55:36.439968800 -0500
@@ -1049,6 +1049,8 @@
                 @SuppressWarnings("unchecked")
                 JComboBox<Object> comboBox = (JComboBox)e.getSource();
                 setListSelection(comboBox.getSelectedIndex());
+            } else {
+                setListSelection(-1);
             }
         }