diff --git a/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java b/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java index 682d5824e008..3773b8d5f5f1 100644 --- a/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java +++ b/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java @@ -208,7 +208,8 @@ public class UnscrambleDialog extends DialogWrapper { } public JComponent getPreferredFocusedComponent() { - return getRootPane().getDefaultButton(); + JRootPane pane = getRootPane(); + return pane != null ? pane.getDefaultButton() : super.getPreferredFocusedComponent(); } private void createLogFileChooser() {