diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc
index d625f053a..8a507c0b7 100644
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -440,7 +440,7 @@ void RTWindow::remEditorPanel (EditorPanel* ep) {
 
 	    mainNB->remove_page (*ep);
 
-	    if (mainNB->get_current_page () == mainNB->page_num (*bpanel)){
+	    if (mainNB->get_current_page () == mainNB->page_num (*bpanel) || mainNB->get_current_page () == mainNB->page_num (*fpanel)){
 		    mainNB->set_current_page (mainNB->page_num (*fpanel));
 		    set_title_decorated("");
 	    }