diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index e63c0b4428..2d4dadef42 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -191,7 +191,8 @@ KeyboardFilter::Filter(BMessage* message, EventTarget** _target,
 
 	if (message->what == B_KEY_DOWN
 		|| message->what == B_MODIFIERS_CHANGED
-		|| message->what == B_UNMAPPED_KEY_DOWN)
+		|| message->what == B_UNMAPPED_KEY_DOWN
+		|| message->what == B_INPUT_METHOD_EVENT)
 		_UpdateFocus(key, _target);
 
 	return B_DISPATCH_MESSAGE;
diff --git a/src/servers/app/EventDispatcher.cpp b/src/servers/app/EventDispatcher.cpp
index 21cb0f3158..c0cf495311 100644
--- a/src/servers/app/EventDispatcher.cpp
+++ b/src/servers/app/EventDispatcher.cpp
@@ -828,6 +828,7 @@ EventDispatcher::_EventLoop()
 			case B_UNMAPPED_KEY_DOWN:
 			case B_UNMAPPED_KEY_UP:
 			case B_MODIFIERS_CHANGED:
+			case B_INPUT_METHOD_EVENT:
 				ETRACE(("key event, focus = %p\n", fFocus));
 
 				if (fKeyboardFilter != NULL