diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java index af207585d4a5..45c1d6e8c2dd 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java @@ -3354,7 +3354,10 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi } private void requestFocus() { - IdeFocusManager.getInstance(myProject).requestFocus(myEditorComponent, true); + final IdeFocusManager focusManager = IdeFocusManager.getInstance(myProject); + if (focusManager.getFocusOwner() != myEditorComponent) { //IDEA-64501 + focusManager.requestFocus(myEditorComponent, true); + } } private void validateMousePointer(MouseEvent e) {