diff --git a/ba/ba0.cpp b/ba/ba0.cpp
index b4769c6a1..9b0166034 100755
--- a/ba/ba0.cpp
+++ b/ba/ba0.cpp
@@ -543,19 +543,18 @@ bool TMenuitem::perform_submenu() const
   bool ok = mnu != NULL && mnu->enabled();
   if (ok)
   {            
-    if (mnu->query_firm())
-      ok = main_app().set_firm();
-    
-    if (ok)
-    {
-      if (mnu->items() == 1)
-      {   
+    if (mnu->items() == 1)
+    {   
+      if (mnu->query_firm())
+        ok = main_app().set_firm();
+      if (ok)
+      {
         const TMenuitem& mi = mnu->item(0);
         ok = mi.enabled() && mi.perform();
-      }  
-      else
-        menu().jumpto(mnu);
-    }    
+      }
+    }  
+    else
+      menu().jumpto(mnu);
   }
   
   return ok;