diff --git a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
index 50d89b809f..66fec0521b 100644
--- a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
+++ b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
@@ -372,9 +372,6 @@ KeyboardInputDevice::KeyboardInputDevice()
 		sLogFile = fopen("/var/log/keyboard_device_log.log", "a");
 #endif
 	CALLED();
-
-	StartMonitoringDevice(kKeyboardDevicesDirectoryPS2);
-	StartMonitoringDevice(kKeyboardDevicesDirectoryUSB);
 }
 
 
@@ -448,6 +445,9 @@ KeyboardInputDevice::InitCheck()
 	// TODO: this doesn't belong here!
 	_RecursiveScan(kKeyboardDevicesDirectory);
 
+	StartMonitoringDevice(kKeyboardDevicesDirectoryPS2);
+	StartMonitoringDevice(kKeyboardDevicesDirectoryUSB);
+
 	return B_OK;
 }