diff --git a/platform/platform-impl/src/com/intellij/ide/actions/UndoDumpHistoryAction.kt b/platform/platform-impl/src/com/intellij/ide/actions/UndoDumpHistoryAction.kt
index 0816c6721ae0..31ccaad53ac6 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/UndoDumpHistoryAction.kt
+++ b/platform/platform-impl/src/com/intellij/ide/actions/UndoDumpHistoryAction.kt
@@ -32,7 +32,7 @@ internal class UndoClearHistoryAction : UndoHistoryAction() {
       .ask(undoManager.project)
     if (confirmedClear) {
       super.perform(undoManager, editor)
-      undoManager.clearStacks(editor)
+      undoManager.clearAndRepairStacks(editor)
       super.perform(undoManager, editor)
       Notification(
         "Undo/redo",
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 1530efc2b5ee..67c2571dcb60 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
@@ -283,6 +283,11 @@ public class UndoManagerImpl extends UndoManager {
     }
   }
 
+  @ApiStatus.Internal
+  public void clearAndRepairStacks(@Nullable FileEditor editor) {
+    clearStacks(editor);
+  }
+
   @ApiStatus.Internal
   protected void undoOrRedo(@Nullable FileEditor editor, boolean isUndo) {
     UndoClientState state = getClientState(editor);