diff --git a/include/sheet.cpp b/include/sheet.cpp
index 0a34b2ac5..2e9b2a20f 100755
--- a/include/sheet.cpp
+++ b/include/sheet.cpp
@@ -244,7 +244,9 @@ void TSheet::handler(WINDOW win, EVENT* ep)
       for (int i = 0; i < MAX_BUT; i++)
         if (_button[i] == b)
         {
-          stop_run(_key[i]);
+          //          stop_run(_key[i]);
+          on_key(_key[i]); 
+          return;
           break;
         }        
     }  
@@ -324,7 +326,8 @@ bool TSheet::on_key(KEY key)
     for (int i = 0; i < MAX_BUT; i++)
       if (_key[i] == key)
       {
-        stop_run(key);
+        if (key != K_ENTER || !_disabled[selected()]) 
+          stop_run(key);
         break;
       }
     break;