diff --git a/src/System-VMEvents/InputEventSensor.class.st b/src/System-VMEvents/InputEventSensor.class.st
index 4fdf056d7d4..5c3bace4472 100644
--- a/src/System-VMEvents/InputEventSensor.class.st
+++ b/src/System-VMEvents/InputEventSensor.class.st
@@ -270,17 +270,18 @@ InputEventSensor >> keyboardPressed [
 { #category : #'private events' }
 InputEventSensor >> mapButtons: buttons modifiers: anInteger [
 	"Map the buttons to yellow or blue based on the given modifiers.
-	If only the red button is pressed, then map
-		Ctrl-RedButton -> BlueButton.
-		Cmd-RedButton -> YellowButton.
+	 If only the red button is pressed, then map
+		Ctrl-RedButton -> YellowButtonBit.
+		Cmd-RedButton -> BlueButtonBit.
 	"
-	(buttons = RedButtonBit)
-		ifFalse:[^buttons].
-	(anInteger allMask: CtrlKeyBit) 
-		ifTrue:[^BlueButtonBit].
-	(anInteger allMask: CommandKeyBit) 
-		ifTrue:[^YellowButtonBit].
-	^buttons
+
+	buttons = RedButtonBit
+		ifFalse: [ ^ buttons ].
+	(anInteger allMask: CtrlKeyBit)
+		ifTrue: [ ^ YellowButtonBit ].
+	(anInteger allMask: CommandKeyBit)
+		ifTrue: [ ^ BlueButtonBit ].
+	^ buttons
 ]
 
 { #category : #'private events' }