diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditHandler.java index 82e5c4cb7008..e4e0c8642df8 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditHandler.java @@ -254,7 +254,7 @@ public class QuickEditHandler implements Disposable, DocumentListener { ApplicationManager.getApplication().invokeLater(() -> { Component owner = FocusManager.getCurrentManager().getFocusOwner(); closeEditor(); - owner.requestFocus(); + if (owner != null) owner.requestFocus(); }, myProject.getDisposed()); } }