diff --git a/include/relapp.cpp b/include/relapp.cpp
index 32a22097e..d37b7f663 100755
--- a/include/relapp.cpp
+++ b/include/relapp.cpp
@@ -1280,11 +1280,18 @@ void TRelation_application::main_loop()
       case K_ENTER:
         if (_lnflag && _curr_transaction != TRANSACTION_RUN)
         {     
-          for (k = 1; k <= MAX_KEYS && !test_key(k, FALSE); k++);
-          if (k <= MAX_KEYS && find(k))
+          if (find(1))
+          {
+            if (_curr_transaction != TRANSACTION_MODIFY)
+              _curr_transaction = TRANSACTION_MODIFY;
             modify_mode();
-          else
-            k = K_QUIT;   // Siamo sicuri?  insert_mode()
+          }
+          else       
+          { 
+            if (_curr_transaction != TRANSACTION_INSERT)
+              _curr_transaction = TRANSACTION_INSERT;
+            insert_mode();
+          }
         }
         else
         {