diff --git a/windows/defwnd.c b/windows/defwnd.c
index 4fa1d6f9b5f..a203f5c0fdd 100644
--- a/windows/defwnd.c
+++ b/windows/defwnd.c
@@ -1034,6 +1034,19 @@ LRESULT WINAPI DefWindowProcW(
 	}
 	break;
 
+    case WM_IME_STARTCOMPOSITION:
+    case WM_IME_COMPOSITION:
+    case WM_IME_ENDCOMPOSITION:
+    case WM_IME_SELECT:
+	{
+	    HWND hwndIME;
+
+	    hwndIME = DEFWND_ImmGetDefaultIMEWnd( hwnd );
+	    if (hwndIME)
+		result = SendMessageW( hwndIME, msg, wParam, lParam );
+	}
+	break;
+
     case WM_INPUTLANGCHANGEREQUEST:
         /* notify about the switch only if it's really our current layout */
         if ((HKL)lParam == GetKeyboardLayout(0))