diff --git a/headers/os/app/AppDefs.h b/headers/os/app/AppDefs.h
index 0533c327cb..d8624b7e93 100644
--- a/headers/os/app/AppDefs.h
+++ b/headers/os/app/AppDefs.h
@@ -38,6 +38,7 @@ enum {
 	B_KEY_UP					= '_KYU',
 	B_UNMAPPED_KEY_DOWN			= '_UKD',
 	B_UNMAPPED_KEY_UP			= '_UKU',
+	B_KEY_MAP_LOADED			= '_KML',
 	B_LAYOUT_WINDOW				= '_LAY',
 	B_MODIFIERS_CHANGED			= '_MCH',
 	B_MINIMIZE					= '_WMN',
diff --git a/src/servers/input/InputServer.cpp b/src/servers/input/InputServer.cpp
index 0dc4ab46c6..b994ef485c 100644
--- a/src/servers/input/InputServer.cpp
+++ b/src/servers/input/InputServer.cpp
@@ -932,21 +932,33 @@ InputServer::HandleGetSetKeyMap(BMessage* message, BMessage* reply)
 {
 	CALLED();
 
+	status_t status;
 	if (message->what == IS_GET_KEY_MAP) {
-		status_t status = reply->AddData("keymap", B_ANY_TYPE, &fKeys, sizeof(fKeys));
+		status = reply->AddData("keymap", B_ANY_TYPE, &fKeys, sizeof(fKeys));
 		if (status == B_OK)
 			status = reply->AddData("key_buffer", B_ANY_TYPE, fChars, fCharsSize);
 
 		return status;
 	}
 
-	if (_LoadKeymap() != B_OK)
-		_LoadSystemKeymap();
+	status = _LoadKeymap();
+	if (status != B_OK) {
+		status = _LoadSystemKeymap();
+		if (status != B_OK)
+			return status;
+	}
 
 	BMessage msg(IS_CONTROL_DEVICES);
 	msg.AddInt32("type", B_KEYBOARD_DEVICE);
 	msg.AddInt32("code", B_KEY_MAP_CHANGED);
-	return fAddOnManager->PostMessage(&msg);
+	status = fAddOnManager->PostMessage(&msg);
+
+	if (status == B_OK) {
+		BMessage appMsg(B_KEY_MAP_LOADED);
+		be_roster->Broadcast(&appMsg);
+	}
+
+	return status;
 }