diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index 1f8e83c3e..053586bca 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -1090,8 +1090,8 @@ void EditorPanel::close ()
         if (iareapanel) {
             iareapanel->imageArea->setPreviewHandler (nullptr);
             iareapanel->imageArea->setImProcCoordinator (nullptr);
-            iareapanel->imageArea->unsubscribe();
         }
+        tpc->editModeSwitchedOff();
 
         rtengine::StagedImageProcessor::destroy (ipc);
         ipc = nullptr;