diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index d22ef625f2..ac9c11a5bb 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -722,7 +722,17 @@ private:
 			if (!was_enabled) {
 				ControlProtocolManager::instance().instantiate (*cpi);
 			} else {
+				Gtk::Window* win = r[_model.editor];
+				if (win) {
+					win->hide ();
+				}
+
 				ControlProtocolManager::instance().teardown (*cpi);
+					
+				if (win) {
+					delete win;
+				}
+				r[_model.editor] = 0;
 				cpi->requested = false;
 			}
 		}