diff --git a/include/form.cpp b/include/form.cpp
index e818ba4ae..09b542afc 100755
--- a/include/form.cpp
+++ b/include/form.cpp
@@ -3601,7 +3601,7 @@ void TForm::arrange_form()
 #endif  
   str_pos = "";  //Azzera la stringa di posizionamento
   for (i=1; i < _ipx; i++) str_pos << " "; //Aggiunge gli spazi necessari...
-  if (_ipx > 0 && _ipy > 0)
+  if (_ipx > 0)
     str_pos << _char_to_pos;   // aggiunge il primo carattere di posizionamento...
   x = _fpx - _ipx ;                 // calcola quanti spazi aggiungere...
   for (i=1; i < x; i++) str_pos << " ";
diff --git a/include/maskfld.cpp b/include/maskfld.cpp
index f3eb04856..8326ddebb 100755
--- a/include/maskfld.cpp
+++ b/include/maskfld.cpp
@@ -3722,14 +3722,20 @@ bool TList_field::on_hit()
 }
 
 bool TList_field::on_key(KEY key)
-{
-  if (key == K_SPACE)
-  {
+{                 
+  switch(key)
+  {         
+  case K_CTRL+K_TAB:
+    set_focusdirty(FALSE);
+    break;              
+  case K_SPACE:
     get_window_data();
     set_dirty();
     return on_hit();
-  }
-  else 
+  case K_F2:  
+    current(0);
+    break;
+  default: 
     if (to_check(key, TRUE))
     {         
       bool ok = TRUE;
@@ -3743,9 +3749,8 @@ bool TList_field::on_key(KEY key)
         }    
       }
     }
-    else
-      if (key == K_F2)
-        current(0);
+    break;
+  }  
   return TEditable_field::on_key(key);
 }