diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/SingleConfigurableEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/SingleConfigurableEditor.java index fd09bc97792f..fd3139d6f392 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/SingleConfigurableEditor.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/SingleConfigurableEditor.java @@ -247,7 +247,8 @@ public class SingleConfigurableEditor extends DialogWrapper { @Override public JComponent getPreferredFocusedComponent() { - JComponent preferred = myConfigurable.getPreferredFocusedComponent(); + Configurable configurable = myConfigurable; + JComponent preferred = configurable == null ? null : configurable.getPreferredFocusedComponent(); return preferred == null ? IdeFocusTraversalPolicy.getPreferredFocusedComponent(myCenterPanel) : preferred; }