diff -r 2cb1b29556f2 -r d65aab67ee8a jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java --- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java Fri Feb 03 18:01:24 2012 +0400 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java Wed Feb 08 16:15:12 2012 +0400 @@ -1236,6 +1236,7 @@ int index = list.locationToIndex(e.getPoint()); optionPane.setInputValue(list.getModel().getElementAt(index)); + optionPane.setValue(JOptionPane.OK_OPTION); } }