diff --git a/src/app/app.cpp b/src/app/app.cpp
index a5d17431..8b0e9150 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -1044,6 +1044,9 @@ Event CApplication::ProcessSystemEvent()
         event.key.key = m_private->currentEvent.key.keysym.sym;
         event.key.unicode = m_private->currentEvent.key.keysym.unicode;
         event.kmodState = m_private->currentEvent.key.keysym.mod;
+
+        if(event.key.key == KEY(KP_ENTER))
+            event.key.key = KEY(RETURN);
     }
     else if ( (m_private->currentEvent.type == SDL_MOUSEBUTTONDOWN) ||
          (m_private->currentEvent.type == SDL_MOUSEBUTTONUP) )
@@ -1213,6 +1216,8 @@ Event CApplication::CreateVirtualEvent(const Event& sourceEvent)
         virtualEvent.type = EVENT_NULL;
     }
 
+    m_input->EventProcess(virtualEvent);
+
     return virtualEvent;
 }
 
diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp
index 59ddef9b..6ac60a34 100644
--- a/src/ui/edit.cpp
+++ b/src/ui/edit.cpp
@@ -450,7 +450,7 @@ bool CEdit::EventProcess(const Event &event)
             return true;
         }
 
-        if ( !bControl && ( event.key.key == KEY(RETURN) || event.key.key == KEY(KP_ENTER) ) )
+        if ( event.key.key == KEY(RETURN) && !bControl )
         {
             Insert('\n');
             SendModifEvent();