--- 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);
             }
         }
 
--- /dev/null	2016-06-30 13:55:45.000000000 -0500
+++ new/test/javax/swing/plaf/basic/BasicComboPopup/8154069/Bug8154069.java	2016-06-30 13:55:43.975399800 -0500
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8154069
+ * @summary Jaws reads wrong values from comboboxes when no element is selected
+ * @run main Bug8154069
+ */
+
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleSelection;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.plaf.nimbus.NimbusLookAndFeel;
+
+public class Bug8154069 {
+
+    private static JFrame frame;
+    private static volatile Exception exception = null;
+
+    public static void main(String args[]) throws Exception {
+        try {
+            try {
+                UIManager.setLookAndFeel(new NimbusLookAndFeel());
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame();
+                String[] petStrings = { "Bird", "Cat" };
+                JComboBox<String> cb = new JComboBox<>(petStrings);
+                cb.setSelectedIndex(1);  // select Cat
+                frame.add(cb);
+                frame.pack();
+                try {
+                    cb.setSelectedIndex(-1);
+                    int i = cb.getSelectedIndex();
+                    if (i != -1) {
+                        throw new RuntimeException("getSelectedIndex is not -1");
+                    }
+                    Object o = cb.getSelectedItem();
+                    if (o != null) {
+                        throw new RuntimeException("getSelectedItem is not null");
+                    }
+                    AccessibleContext ac = cb.getAccessibleContext();
+                    AccessibleSelection as = ac.getAccessibleSelection();
+                    int count = as.getAccessibleSelectionCount();
+                    if (count != 0) {
+                        throw new RuntimeException("getAccessibleSelection count is not 0");
+                    }
+                    Accessible a = as.getAccessibleSelection(0);
+                    if (a != null) {
+                        throw new RuntimeException("getAccessibleSelection(0) is not null");
+                    }
+                } catch (Exception e) {
+                    exception = e;
+                }
+            });
+            if (exception != null) {
+                System.out.println("Test failed: " + exception.getMessage());
+                throw exception;
+            } else {
+                System.out.println("Test passed.");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                frame.dispose();
+            });
+        }
+    }
+
+}