diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index cc64246844..7b138bc75f 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -2075,6 +2075,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     switch ( event.GetKeyCode() )
     {
         case WXK_RETURN:
+        case WXK_NUMPAD_ENTER:
             // Single line controls only get this key code if they have
             // wxTE_PROCESS_ENTER style, but multiline ones always get it
             // because they need it for themselves. However we shouldn't
diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index 7bb30d0702..efe6c4fdd8 100644
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -580,6 +580,7 @@ private:
         switch ( event.GetKeyCode() )
         {
             case WXK_RETURN:
+            case WXK_NUMPAD_ENTER:
                 if ( m_win->HasFlag(wxTE_PROCESS_ENTER) )
                     specialKey = true;
                 break;