diff --git a/include/mask.cpp b/include/mask.cpp
index 9ca69e17e..620d9ca2c 100755
--- a/include/mask.cpp
+++ b/include/mask.cpp
@@ -335,8 +335,10 @@ int TMask::first_focus(short id, bool dirty)
       if (f < 0 || !fld(f).active())
       {
         f = find_first_active(curr_win());
-        if (f < 0 && toolwin())
+        if (f < 0 && toolwin() != NULL_WIN)
           f = find_first_active(toolwin());
+        if (f < 0 && toolbar() != NULL_WIN)
+          f = find_first_active(toolbar());
       }
     }
   }