diff --git a/src/client/joystick_controller.h b/src/client/joystick_controller.h
index 98486df43..d74cc3db6 100644
--- a/src/client/joystick_controller.h
+++ b/src/client/joystick_controller.h
@@ -155,6 +155,11 @@ public:
 	float getMovementDirection();
 	float getMovementSpeed();
 
+	u8 getJoystickId() const
+	{
+		return m_joystick_id;
+	}
+
 	f32 doubling_dtime;
 
 private:
diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp
index 0371c26f3..40a445a0c 100644
--- a/src/gui/guiFormSpecMenu.cpp
+++ b/src/gui/guiFormSpecMenu.cpp
@@ -3976,10 +3976,9 @@ bool GUIFormSpecMenu::preprocessEvent(const SEvent& event)
 	}
 
 	if (event.EventType == irr::EET_JOYSTICK_INPUT_EVENT) {
-		/* TODO add a check like:
-		if (event.JoystickEvent != joystick_we_listen_for)
+		if (event.JoystickEvent.Joystick != m_joystick->getJoystickId())
 			return false;
-		*/
+
 		bool handled = m_joystick->handleEvent(event.JoystickEvent);
 		if (handled) {
 			if (m_joystick->wasKeyDown(KeyType::ESC)) {