diff --git a/src/main/java/de/bwravencl/controllerbuddy/input/action/gui/KeystrokeEditorBuilder.java b/src/main/java/de/bwravencl/controllerbuddy/input/action/gui/KeystrokeEditorBuilder.java
index 73ff8b2e..562ef95b 100644
--- a/src/main/java/de/bwravencl/controllerbuddy/input/action/gui/KeystrokeEditorBuilder.java
+++ b/src/main/java/de/bwravencl/controllerbuddy/input/action/gui/KeystrokeEditorBuilder.java
@@ -210,6 +210,11 @@ private void initListSelection(final JList<?> list, final ScanCode[] scanCodes)
 				list.addSelectionInterval(index, index);
 			}
 		});
+
+		final var minSelectionIndex = list.getMinSelectionIndex();
+		if (minSelectionIndex >= 0) {
+			list.ensureIndexIsVisible(minSelectionIndex);
+		}
 	}
 
 	private void updateUpdateKeyStrokeVisualization() {