1 files changed, 8 insertions, 1 deletions
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 8d236383dac2..b8f026503dc4 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -5422,7 +5422,14 @@ void ScDocument::SetSubTotalCellsDirty(const ScRange& rDirtyRange)
 
 void ScDocument::EnableUndo( bool bVal )
 {
-    GetUndoManager()->EnableUndo(bVal);
+    // The undo manager increases lock count every time undo is disabled.
+    // Because of this, we shouldn't disable undo unless it's currently
+    // enabled, or else re-enabling it may not actually re-enable undo unless
+    // the lock count becomes zero.
+
+    if (bVal != GetUndoManager()->IsUndoEnabled())
+        GetUndoManager()->EnableUndo(bVal);
+
     mbUndoEnabled = bVal;
 }