diff --git a/cg/cg4400.cpp b/cg/cg4400.cpp
index ff3d72b41..142b1c908 100755
--- a/cg/cg4400.cpp
+++ b/cg/cg4400.cpp
@@ -530,9 +530,7 @@ bool CG4400_application::to_ditt_handler(TMask_field& f, KEY key)
 {
   TMask& m = f.mask();
   if (key == K_F9)
-  {
     app().to_butt_handler(m.field(BUT_DTO), K_SPACE);
-  }
   if (key == K_TAB && f.focusdirty())
   {
     const long l = app().select_firm_range(m.get_long(DA_CODICE), m.get_long(A_CODICE)); 
@@ -546,14 +544,12 @@ bool CG4400_application::fr_ditt_handler(TMask_field& f, KEY key)
 {                          
   TMask& m = f.mask();
   if (key == K_F9)
-  {
     app().fr_butt_handler(m.field(BUT_DFR), K_SPACE);
-  }
   else if (key == K_TAB && f.focusdirty())
   {
     const long l = app().select_firm_range(m.get_long(DA_CODICE), m.get_long(A_CODICE)); 
     app().set_choice_limits(m);
-    m.field(F_SELECT).set(format("%ld", l));
+    m.field(F_SELECT).set(format("%ld", l)); 
   }
   return TRUE;
 }
@@ -569,7 +565,7 @@ bool CG4400_application::to_butt_handler(TMask_field& f, KEY key)
     if (sh->run() == K_ENTER)
     {
       app().select_firm_range(m.get_long(DA_CODICE),sh->row(sh->selected()).get_long(1)); 
-      app().set_choice_limits(m);
+      app().set_choice_limits(m);           
     }
   }
   return TRUE;
@@ -607,6 +603,10 @@ void CG4400_application::set_choice_limits(TMask& m)
   if (first != -1) m.field(DA_CODICE).set(format("%ld",first));                        
   if (last  != -1) m.field(A_CODICE).set(format("%ld",last));                        
   m.set(F_SELECT, _selected.ones());
+  //modifica del 02/06/1995
+  if (m.is_running()) 
+    if (first != -1l) app().set_firm(first);   
+  //fine  
 }
 
 long CG4400_application::select_firm_range(long from, long to)