diff --git a/src/gui/ControllerBindingsGui.hx b/src/gui/ControllerBindingsGui.hx
index b54795b1..ee69e4bf 100644
--- a/src/gui/ControllerBindingsGui.hx
+++ b/src/gui/ControllerBindingsGui.hx
@@ -217,6 +217,8 @@ class ControllerBindingsGui extends GuiImage {
 		}
 		if (prevSelected == 0 && selectedColumn == 1) {
 			btnListLeft.selected = btnListRight.selected;
+			if (btnListLeft.selected > btnListLeft.buttons.length - 1)
+				btnListLeft.selected = btnListLeft.buttons.length - 1;
 		}
 		if (prevSelected == 1 && selectedColumn == 0) {
 			btnListRight.selected = btnListLeft.selected;