diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp
index 7d1fe55dd5..1e152f6d0e 100644
--- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp
@@ -237,6 +237,7 @@ void pad_settings_dialog::InitButtons()
 	m_padButtons->addButton(ui->b_reset, button_ids::id_reset_parameters);
 	m_padButtons->addButton(ui->b_blacklist, button_ids::id_blacklist);
 	m_padButtons->addButton(ui->b_refresh, button_ids::id_refresh);
+	m_padButtons->addButton(ui->b_addProfile, button_ids::id_add_profile);
 	m_padButtons->addButton(ui->b_ok, button_ids::id_ok);
 	m_padButtons->addButton(ui->b_cancel, button_ids::id_cancel);
 
@@ -462,6 +463,12 @@ void pad_settings_dialog::ReactivateButtons()
 	{
 		but->setFocusPolicy(Qt::StrongFocus);
 	}
+
+	m_tabs->setFocusPolicy(Qt::TabFocus);
+
+	ui->chooseProfile->setFocusPolicy(Qt::WheelFocus);
+	ui->chooseHandler->setFocusPolicy(Qt::WheelFocus);
+	ui->chooseDevice->setFocusPolicy(Qt::WheelFocus);
 }
 
 void pad_settings_dialog::RepaintPreviewLabel(QLabel* l, int dz, int w, int x, int y)
@@ -599,6 +606,7 @@ void pad_settings_dialog::OnPadButtonClicked(int id)
 	{
 	case button_ids::id_pad_begin:
 	case button_ids::id_pad_end:
+	case button_ids::id_add_profile:
 	case button_ids::id_refresh:
 	case button_ids::id_ok:
 	case button_ids::id_cancel:
@@ -620,6 +628,12 @@ void pad_settings_dialog::OnPadButtonClicked(int id)
 		but->setFocusPolicy(Qt::ClickFocus);
 	}
 
+	m_tabs->setFocusPolicy(Qt::ClickFocus);
+
+	ui->chooseProfile->setFocusPolicy(Qt::ClickFocus);
+	ui->chooseHandler->setFocusPolicy(Qt::ClickFocus);
+	ui->chooseDevice->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));
diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.h b/rpcs3/rpcs3qt/pad_settings_dialog.h
index bf95f26f45..571267bdae 100644
--- a/rpcs3/rpcs3qt/pad_settings_dialog.h
+++ b/rpcs3/rpcs3qt/pad_settings_dialog.h
@@ -61,6 +61,7 @@ class pad_settings_dialog : public QDialog
 		id_reset_parameters,
 		id_blacklist,
 		id_refresh,
+		id_add_profile,
 		id_ok,
 		id_cancel
 	};