diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index aa8120353..62b96570a 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -1038,8 +1038,10 @@ void cmCursesMainForm::HandleInput()
         CurrentForm = msgs;
         msgs->Render(1,1,x,y);
         msgs->HandleInput();
-        CurrentForm = this;
+        CurrentForm = this; 
         this->Render(1,1,x,y);
+        set_current_field(m_Form, cur);
+        delete msgs;
         }
       // display last errors
       else if ( key == 'l' )
@@ -1052,6 +1054,7 @@ void cmCursesMainForm::HandleInput()
         msgs->HandleInput();
         CurrentForm = this;
         this->Render(1,1,x,y);
+        delete msgs;
         }
       else if ( key == '/' )
         {