diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 758590069e..9773f02c84 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -6316,6 +6316,9 @@ int VKToWX(WXWORD vk, WXLPARAM lParam, wchar_t *uc)
             // don't use ChooseNormalOrExtended() here as the keys are reversed
             // here: numpad enter is the extended one
             wxk = HIWORD(lParam) & KF_EXTENDED ? WXK_NUMPAD_ENTER : WXK_RETURN;
+
+            if ( uc )
+                *uc = WXK_RETURN;
             break;
 
         default: