diff --git a/ba/ba0.cpp b/ba/ba0.cpp
index 5433edf66..4a14c8ea7 100755
--- a/ba/ba0.cpp
+++ b/ba/ba0.cpp
@@ -1377,9 +1377,9 @@ bool TMenu_application::create()
     TFilename menu = (argc() < 2) ? "baprassi" : argv(1);
     menu.ext("men");
     _menu.read(menu);
+    dispatch_e_menu(MENU_ITEM(1));
   }
   
-  dispatch_e_menu(MENU_ITEM(1));
   return TRUE;
 }
 
@@ -1560,11 +1560,11 @@ bool TMenu_application::choose_study()
   bool ok = m.run() == K_ENTER;
   if (ok)
   {         
-    _mask->close_modal();
-    do_events();
     destroy();
     prefix().set_studio(m.get(DLG_USER));
-    create();
+    ok = create();
+    if (!ok)
+      stop_run();
   }
   return ok;
 }