diff --git a/libs/flake/KoCanvasControllerWidget.cpp b/libs/flake/KoCanvasControllerWidget.cpp
--- a/libs/flake/KoCanvasControllerWidget.cpp
+++ b/libs/flake/KoCanvasControllerWidget.cpp
@@ -205,6 +205,7 @@
 
 KoCanvasControllerWidget::~KoCanvasControllerWidget()
 {
+    d->viewportWidget->canvas()->removeEventFilter(this);
     d->unsetCanvas();
     delete d;
 }
diff --git a/libs/pageapp/KoPAView.cpp b/libs/pageapp/KoPAView.cpp
--- a/libs/pageapp/KoPAView.cpp
+++ b/libs/pageapp/KoPAView.cpp
@@ -180,11 +180,9 @@
     removeStatusBarItem(d->status);
     removeStatusBarItem(d->zoomActionWidget);
 
+    delete d->canvasController;
     delete d->zoomController;
-    // Delete only the view mode normal, let the derived class delete
-    // the currently active view mode if it is not view mode normal
-    // using a delete here can cause a crash if an object is deleted
-    d->viewModeNormal->deleteLater();
+    delete d->viewModeNormal;
 
     delete d;
 }