diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
index 44bc67e3f0..7c01a527a2 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
@@ -15,6 +15,7 @@
 #include "DolphinQt2/Config/Mapping/MappingCommon.h"
 #include "DolphinQt2/Config/Mapping/MappingWidget.h"
 #include "DolphinQt2/Config/Mapping/MappingWindow.h"
+#include "DolphinQt2/QtUtils/BlockUserInputFilter.h"
 #include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
@@ -42,9 +43,7 @@ void MappingButton::OnButtonPressed()
   if (m_parent->GetDevice() == nullptr || !m_reference->IsInput())
     return;
 
-  if (!m_block.TestAndSet())
-    return;
-
+  installEventFilter(BlockUserInputFilter::Instance());
   grabKeyboard();
   grabMouse();
 
@@ -63,7 +62,7 @@ void MappingButton::OnButtonPressed()
 
     releaseMouse();
     releaseKeyboard();
-    m_block.Clear();
+    removeEventFilter(BlockUserInputFilter::Instance());
 
     if (!expr.isEmpty())
     {
@@ -97,22 +96,6 @@ void MappingButton::Update()
   m_parent->SaveSettings();
 }
 
-bool MappingButton::event(QEvent* event)
-{
-  const QEvent::Type event_type = event->type();
-  // Returning 'true' means "yes, this event has been handled, don't propagate it to parent
-  // widgets".
-  if (m_block.IsSet() &&
-      (event_type == QEvent::KeyPress || event_type == QEvent::KeyRelease ||
-       event_type == QEvent::MouseButtonPress || event_type == QEvent::MouseButtonRelease ||
-       event_type == QEvent::MouseButtonDblClick))
-  {
-    return true;
-  }
-
-  return QPushButton::event(event);
-}
-
 void MappingButton::mouseReleaseEvent(QMouseEvent* event)
 {
   switch (event->button())
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.h b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.h
index 0714147d43..a8894119e7 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.h
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.h
@@ -25,7 +25,6 @@ signals:
   void AdvancedPressed();
 
 private:
-  bool event(QEvent* event) override;
   void mouseReleaseEvent(QMouseEvent* event) override;
 
   void OnButtonPressed();
@@ -34,5 +33,4 @@ private:
 
   MappingWidget* m_parent;
   ControlReference* m_reference;
-  Common::Flag m_block;
 };