diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoClientState.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoClientState.java
index a4fccafd9211..0dc91047e8ef 100644
--- a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoClientState.java
+++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoClientState.java
@@ -184,6 +184,7 @@ final class UndoClientState implements Disposable {
         currentProject = commandProject;
       }
       if (project != null && project == commandProject && recordOriginalReference) {
+        // note: originatorReference depends on FocusedComponent :sad_trombone_for_rd:, see IJPL-192250
         originatorReference = UndoDocumentUtil.getDocReference(project, editorProvider);
       }
     }
diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java
index 06cb887c7d69..481582e2a7cb 100644
--- a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java
@@ -346,7 +346,8 @@ public class UndoManagerImpl extends UndoManager {
     mySharedUndoStacksHolder.trimStacks(Collections.singleton(docRef));
   }
 
-  void onCommandStarted(
+  @ApiStatus.Internal
+  protected void onCommandStarted(
     @Nullable Project project,
     @NotNull UndoConfirmationPolicy undoConfirmationPolicy,
     boolean recordOriginalReference