diff --git a/CHANGES b/CHANGES
index e140b0270..f2657c24a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -33,6 +33,7 @@ Misc:
  - GBA Video: Null renderer should return proper register values
  - Libretro: Disable logging game errors, BIOS calls and stubs in release builds
  - Qt: Canonicalize file paths when loading games
+ - Qt: Add refresh button to controller editing
 
 0.4.0: (2016-02-02)
 Features:
diff --git a/src/platform/qt/GBAKeyEditor.cpp b/src/platform/qt/GBAKeyEditor.cpp
index 20744b6da..b08ad36c2 100644
--- a/src/platform/qt/GBAKeyEditor.cpp
+++ b/src/platform/qt/GBAKeyEditor.cpp
@@ -57,20 +57,11 @@ GBAKeyEditor::GBAKeyEditor(InputController* controller, int type, const QString&
 
 #ifdef BUILD_SDL
 	if (type == SDL_BINDING_BUTTON) {
-		controller->updateJoysticks();
-		controller->recalibrateAxes();
-		lookupAxes(map);
-
 		m_profileSelect = new QComboBox(this);
-		m_profileSelect->addItems(controller->connectedGamepads(type));
-		int activeGamepad = controller->gamepad(type);
-		selectGamepad(activeGamepad);
-		if (activeGamepad > 0) {
-			m_profileSelect->setCurrentIndex(activeGamepad);
-		}
-
 		connect(m_profileSelect, SIGNAL(currentIndexChanged(int)), this, SLOT(selectGamepad(int)));
 
+		updateJoysticks();
+
 		m_clear = new QWidget(this);
 		QHBoxLayout* layout = new QHBoxLayout;
 		m_clear->setLayout(layout);
@@ -97,6 +88,10 @@ GBAKeyEditor::GBAKeyEditor(InputController* controller, int type, const QString&
 			(*m_currentKey)->clearAxis();
 			(*m_currentKey)->blockSignals(signalsBlocked);
 		});
+
+		QPushButton* updateJoysticksButton = new QPushButton(tr("Refresh"));
+		layout->addWidget(updateJoysticksButton);
+		connect(updateJoysticksButton, SIGNAL(pressed()), this, SLOT(updateJoysticks()));
 	}
 #endif
 
@@ -355,3 +350,19 @@ void GBAKeyEditor::setLocation(QWidget* widget, qreal x, qreal y) {
 	widget->setGeometry(s.width() * x - hint.width() / 2.0, s.height() * y - hint.height() / 2.0, hint.width(),
 	                    hint.height());
 }
+
+#ifdef BUILD_SDL
+void GBAKeyEditor::updateJoysticks() {
+	m_controller->updateJoysticks();
+	m_controller->recalibrateAxes();
+
+	m_profileSelect->clear();
+	m_profileSelect->addItems(m_controller->connectedGamepads(m_type));
+	int activeGamepad = m_controller->gamepad(m_type);
+	selectGamepad(activeGamepad);
+	if (activeGamepad > 0) {
+		m_profileSelect->setCurrentIndex(activeGamepad);
+	}
+	lookupAxes(m_controller->map());
+}
+#endif
diff --git a/src/platform/qt/GBAKeyEditor.h b/src/platform/qt/GBAKeyEditor.h
index 6637571d2..0c7ba4359 100644
--- a/src/platform/qt/GBAKeyEditor.h
+++ b/src/platform/qt/GBAKeyEditor.h
@@ -47,6 +47,7 @@ private slots:
 #ifdef BUILD_SDL
 	void setAxisValue(int axis, int32_t value);
 	void selectGamepad(int index);
+	void updateJoysticks();
 #endif
 
 private: