diff --git a/include/sheet.cpp b/include/sheet.cpp
index 7eab209ad..0862364eb 100755
--- a/include/sheet.cpp
+++ b/include/sheet.cpp
@@ -175,7 +175,7 @@ TSheet_control::TSheet_control(
   l->scroll_bar         = TRUE;                        
   l->scroll_bar_button  = TRUE;
   l->white_space_color  = MASK_DARK_COLOR;
-  l->row_focus_border   = TRUE;
+//  l->row_focus_border   = TRUE;
   
   // Definizione della prima colonna (numero di riga)
   const long attr = XI_ATR_VISIBLE | XI_ATR_RJUST | XI_ATR_SELECTABLE;                                            
@@ -307,28 +307,28 @@ void TSheet_control::update(long n)
     
     if (scroll_first)
       xi_scroll(_obj, XI_SCROLL_FIRST);
-    else
-      xi_scroll_rec(_obj, n, FOCUS_COLOR, XI_ATR_ENABLED, 0);
+    else 
+      xi_scroll(_obj, 0);
+//      xi_scroll_rec(_obj, n, FOCUS_COLOR, XI_ATR_ENABLED, 0);
   }  
 }
 
 void TSheet_control::make_current(long rec)
-{                               
+{               
   const long old = _cur_rec;
   _cur_rec = rec;
   
   XI_OBJ o; 
-  int row = rec2row(old);
-  if (row >= 0)
+  const int oldrow = rec2row(old);
+  if (oldrow >= 0)
   {
-    XI_MAKE_ROW(&o, _obj, row);
+    XI_MAKE_ROW(&o, _obj, oldrow);
     xi_cell_request(&o);
   }  
-  
-  row = rec2row(rec);
-  if (row >= 0)
+  const int newrow = rec2row(rec);
+  if (newrow != oldrow && newrow >= 0)
   {
-    XI_MAKE_ROW(&o, _obj, row);
+    XI_MAKE_ROW(&o, _obj, newrow);
     xi_cell_request(&o);
   }  
 }