Index: modules/swing/src/main/java/common/javax/swing/plaf/metal/MetalFileChooserUI.java =================================================================== --- modules/swing/src/main/java/common/javax/swing/plaf/metal/MetalFileChooserUI.java (revision 570378) +++ modules/swing/src/main/java/common/javax/swing/plaf/metal/MetalFileChooserUI.java (working copy) @@ -849,8 +849,8 @@ fileNameField.setText(fileToText(getFileChooser().getCurrentDirectory())); } } else if (JFileChooser.ACCESSORY_CHANGED_PROPERTY.equals(changedProperty)) { - final JComponent old = (JComponent) event.getOldValue(); - + final JComponent old = (JComponent) event.getOldValue(); + if (old != null) { getAccessoryPanel().remove(old); } @@ -1124,10 +1124,6 @@ super.processKeyEvent(event); } - - public boolean getScrollableTracksViewportHeight() { - return true; - } }; table.setShowGrid(false); table.setSelectionModel(list.getSelectionModel());