diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp
index d7ff5214b..c5ae2b423 100644
--- a/src/qt/qt_rendererstack.cpp
+++ b/src/qt/qt_rendererstack.cpp
@@ -75,15 +75,10 @@ RendererStack::RendererStack(QWidget *parent, int monitor_index)
     if (!mouse_type || (mouse_type[0] == '\0') || !stricmp(mouse_type, "auto")) {
         if (QApplication::platformName().contains("wayland"))
             strcpy(auto_mouse_type, "wayland");
-#   if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         else if (QApplication::platformName() == "eglfs")
             strcpy(auto_mouse_type, "evdev");
         else if (QApplication::platformName() == "xcb")
             strcpy(auto_mouse_type, "xinput2");
-#   else
-        else if (QApplication::platformName() == "eglfs" || QApplication::platformName() == "xcb")
-            strcpy(auto_mouse_type, "evdev");
-#   endif
         else
             auto_mouse_type[0] = '\0';
         mouse_type = auto_mouse_type;
diff --git a/src/qt/xinput2_mouse.cpp b/src/qt/xinput2_mouse.cpp
index 07791b5ba..b1887bedc 100644
--- a/src/qt/xinput2_mouse.cpp
+++ b/src/qt/xinput2_mouse.cpp
@@ -81,8 +81,7 @@ void xinput2_proc()
     Window win;
     win = DefaultRootWindow(disp);
 
-    // XIAllMasterDevices doesn't work for click-and-drag operations.
-    ximask.deviceid = XIAllDevices;
+    ximask.deviceid = XIAllMasterDevices;
     ximask.mask_len = XIMaskLen(XI_LASTEVENT);
     ximask.mask = (unsigned char*)calloc(ximask.mask_len, sizeof(unsigned char));
 
@@ -166,7 +165,7 @@ void xinput2_init()
         qWarning() << "Cannot open current X11 display";
         return;
     }
-    auto event = 0, err = 0, minor = 0, major = 2;
+    auto event = 0, err = 0, minor = 1, major = 2;
     if (XQueryExtension(disp, "XInputExtension", &xi2opcode, &event, &err))
     {
         if (XIQueryVersion(disp, &major, &minor) == Success)