diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp
index fed6508fb4..1cf632fa1f 100644
--- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp
@@ -278,6 +278,11 @@ void pad_settings_dialog::ReactivateButtons()
 	m_button_id = button_ids::id_pad_begin;
 	UpdateLabel();
 	SwitchButtons(true);
+
+	for (auto but : m_padButtons->buttons())
+	{
+		but->setFocusPolicy(Qt::StrongFocus);
+	}
 }
 
 void pad_settings_dialog::RepaintPreviewLabel(QLabel* l, int dz, int w, int x, int y)
@@ -405,6 +410,11 @@ void pad_settings_dialog::OnPadButtonClicked(int id)
 		break;
 	}
 
+	for (auto but : m_padButtons->buttons())
+	{
+		but->setFocusPolicy(Qt::ClickFocus);
+	}
+
 	m_button_id = id;
 	m_padButtons->button(m_button_id)->setText(tr("[ Waiting %1 ]").arg(MAX_SECONDS));
 	m_padButtons->button(m_button_id)->setPalette(QPalette(Qt::blue));