diff --git a/src/app/puzzle/vpmainwindow.cpp b/src/app/puzzle/vpmainwindow.cpp
index e7693f5da..f211fb3ca 100644
--- a/src/app/puzzle/vpmainwindow.cpp
+++ b/src/app/puzzle/vpmainwindow.cpp
@@ -450,7 +450,12 @@ VPMainWindow::VPMainWindow(VPCommandLinePtr cmd, QWidget *parent)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-VPMainWindow::~VPMainWindow() = default;
+VPMainWindow::~VPMainWindow()
+{
+    // Preventing crash. Deleting QUndoStack can trigger QUndoStack::cleanChanged which will call LayoutWasSaved method
+    // after deleting VPMainWindow.
+    m_undoStack->blockSignals(true);
+}
 
 //---------------------------------------------------------------------------------------------------------------------
 auto VPMainWindow::CurrentFile() const -> QString