diff --git a/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Components.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Components.java
index 1b1d80f8..22431784 100644
--- a/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Components.java
+++ b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Components.java
@@ -482,6 +482,7 @@ public abstract class Components {
                 } );
                 putClientProperty( "JComboBox.isPopDown", Boolean.TRUE );
                 setAlignmentX( LEFT_ALIGNMENT );
+                addMouseWheelListener(e -> setSelectedIndex((getSelectedIndex() + e.getWheelRotation() + getItemCount()) % getItemCount()));
             }
 
             @Override