diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c
index 979425f69c..36409fc6bf 100644
--- a/input/drivers/udev_input.c
+++ b/input/drivers/udev_input.c
@@ -1234,6 +1234,7 @@ static bool open_devices(udev_input_t *udev,
       return false;
 
    udev_enumerate_add_match_property(enumerate, type_str, "1");
+   udev_enumerate_add_match_subsystem(enumerate, "input");
    udev_enumerate_scan_devices(enumerate);
    devs = udev_enumerate_get_list_entry(enumerate);
 
diff --git a/input/drivers_joypad/udev_joypad.c b/input/drivers_joypad/udev_joypad.c
index 4b985f1953..bac970fb5d 100644
--- a/input/drivers_joypad/udev_joypad.c
+++ b/input/drivers_joypad/udev_joypad.c
@@ -574,6 +574,7 @@ static void *udev_joypad_init(void *data)
       goto error;
 
    udev_enumerate_add_match_property(enumerate, "ID_INPUT_JOYSTICK", "1");
+   udev_enumerate_add_match_subsystem(enumerate, "input");
    udev_enumerate_scan_devices(enumerate);
    devs = udev_enumerate_get_list_entry(enumerate);