diff --git a/src/laybasic/laybasic/layLayoutView.cc b/src/laybasic/laybasic/layLayoutView.cc
index 1fd60ba08..3101d5c65 100644
--- a/src/laybasic/laybasic/layLayoutView.cc
+++ b/src/laybasic/laybasic/layLayoutView.cc
@@ -309,6 +309,10 @@ LayoutView::~LayoutView ()
 {
   close_event ();
 
+  if (ms_current == this) {
+    ms_current = 0;
+  }
+
   if (mp_control_frame) {
     delete mp_control_frame;
   }