diff --git a/include/relapp.cpp b/include/relapp.cpp
index a2633ff0b..6d7c0741d 100755
--- a/include/relapp.cpp
+++ b/include/relapp.cpp
@@ -239,7 +239,6 @@ void TRelation_application::enable_query()
   set_fixed();
 }
 
-
 void TRelation_application::set_toolbar()
 {
   const int mode = _mask->mode();
@@ -301,6 +300,14 @@ void TRelation_application::set_toolbar()
   enable_query();
 }
 
+void TRelation_application::update_navigation_bar()
+{
+  if (_mask->query_mode())
+  {
+    set_limits();
+    set_toolbar();
+  }
+}
 
 bool TRelation_application::save_and_new() const
 { return FALSE; }
diff --git a/include/relapp.h b/include/relapp.h
index 473b89516..479f865a0 100755
--- a/include/relapp.h
+++ b/include/relapp.h
@@ -84,6 +84,8 @@ private:
   bool test_key(word k, bool err);
   // @cmember:(INTERNAL) Abilita la ricerca sulla maschera
   void enable_query();
+    // @cmember:(INTERNAL) Setta i limiti
+  void set_limits(byte what = 0x3);
   // @cmember:(INTERNAL) Abilita i vari bottoni di ricerca della toolbar
   void set_toolbar();
   
@@ -236,8 +238,9 @@ protected:
 
 // @access Public Member  
 public:
-  // @cmember:(INTERNAL) Setta i limiti
-  void set_limits(byte what = 0x3);
+  // @cmember Ricalcola l'attivazione dei bottoni di navigazione
+  void update_navigation_bar();
+
   // @cmember Ritorna la maschera corrente
   TMask& curr_mask() const 
   { return *_mask; }