diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index 78afff8b..1a983df3 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -1885,9 +1885,9 @@ void UBBoardController::appMainModeChanged(UBApplicationController::MainMode md)
 void UBBoardController::closing()
 {
     mIsClosing = true;
+    lastWindowClosed();
     ClearUndoStack();
     showKeyboard(false);
-    lastWindowClosed();
 }
 
 void UBBoardController::lastWindowClosed()