diff --git a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
index 66fec0521b..c1a01f8db1 100644
--- a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
+++ b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
@@ -8,6 +8,7 @@
 #include "kb_mouse_driver.h"
 
 #include <Application.h>
+#include <Autolock.h>
 #include <Directory.h>
 #include <Entry.h>
 #include <NodeMonitor.h>
@@ -365,7 +366,8 @@ get_short_name(const char *longName)
 
 KeyboardInputDevice::KeyboardInputDevice()
 	:
-	fTMWindow(NULL)
+	fTMWindow(NULL),
+	fKeymapLock("keymap lock")
 {
 #if DEBUG
 	if (sLogFile == NULL)
@@ -428,7 +430,8 @@ KeyboardInputDevice::_InitFromSettings(void *cookie, uint32 opcode)
 
 	if (opcode == 0 
 		|| opcode == B_KEY_MAP_CHANGED 
-		|| opcode == B_KEY_LOCKS_CHANGED) {	
+		|| opcode == B_KEY_LOCKS_CHANGED) {
+		BAutolock lock(fKeymapLock);
 		fKeymap.LoadCurrent();
 		device->modifiers = fKeymap.Locks();
 		_SetLeds(device);
@@ -697,6 +700,8 @@ KeyboardInputDevice::_DeviceWatcher(void *arg)
 			}
 		}
 
+		BAutolock lock(owner->fKeymapLock);
+
 		uint32 modifiers = keymap->Modifier(keycode);
 		if (modifiers 
 			&& (!(modifiers & (B_CAPS_LOCK | B_NUM_LOCK | B_SCROLL_LOCK)) 
diff --git a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.h b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.h
index fa769ce798..8ce254b05b 100644
--- a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.h
+++ b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.h
@@ -12,6 +12,7 @@
 
 #include <Handler.h>
 #include <InputServerDevice.h>
+#include <Locker.h>
 #include <List.h>
 
 #include <stdio.h>
@@ -74,6 +75,7 @@ class KeyboardInputDevice : public BInputServerDevice {
 		BList fDevices;
 		Keymap	fKeymap;
 		TMWindow *fTMWindow;
+		BLocker	fKeymapLock;
 };
 
 extern "C" BInputServerDevice *instantiate_input_device();