diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index e7ff6152d..21449237b 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -423,14 +423,14 @@ void EditorPanel::close () {
 }
 
 void EditorPanel::saveProfile () {
-    if (!ipc) return;
+    if (!ipc || !openThm) return;
 
     ProcParams params;
     ipc->getParams (&params);
 
     if (options.saveParamsFile)
         params.save (openThm->getFileName() + paramFileExtension);
-    if (openThm && options.saveParamsCache)
+    if (options.saveParamsCache)
         openThm->setProcParams (params, EDITOR);
 }
 
diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc
index 5925d3f65..d58673e99 100644
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -170,8 +170,7 @@ void RTWindow::on_mainNB_switch_page(GtkNotebookPage* page, guint page_num) {
 	} else {
         if (isSingleTabMode()) {
             // Save profile on leaving the editor pane
-            EditorPanel* ep = (EditorPanel*)mainNB->get_nth_page (mainNB->get_current_page());
-            ep->saveProfile();
+            epanel->saveProfile();
 
             MoveFileBrowserToMain();
         }