diff --git a/include/msksheet.cpp b/include/msksheet.cpp
index ef6cd822a..a60918dd0 100755
--- a/include/msksheet.cpp
+++ b/include/msksheet.cpp
@@ -900,7 +900,10 @@ void TSpreadsheet::list_handler(XI_EVENT *xiev)
           ok = notify(_cur_rec, K_ENTER);       // Notify edit
         } 
         if (ok)
+        {
           xvt_statbar_refresh();
+          _edit_field = NULL;                   // Reset current field
+        }  
         else
         {
           _edit_field = old;                   // Restore currrent field
@@ -1476,7 +1479,6 @@ void TSpreadsheet::set_column_header(const int col, const TString&  header) cons
 bool TSpreadsheet::cell_disabled(int row, int column) const
 {
   TBit_array* ba = (TBit_array*)_disabled.objptr(row);
-  
   bool d;
   if (column < 0)
     d = ba == NULL ? FALSE : (ba->ones() == columns()-1);