diff --git a/src/kernal/keyboard_m65/mega65_scnkey.s b/src/kernal/keyboard_m65/mega65_scnkey.s
index a76a0b33..c2abed52 100644
--- a/src/kernal/keyboard_m65/mega65_scnkey.s
+++ b/src/kernal/keyboard_m65/mega65_scnkey.s
@@ -88,6 +88,7 @@ m65_scnkey:
 	stx SHFLAG                         ; .X is $00 here
 
 	lda M65_KB_BUCKY
+	beq m65_scnkey_bucky_done
 	dex                                ; index into kb_matrix_bucky_shflag
 
 	; FALLTROUGH
@@ -96,22 +97,22 @@ m65_scnkey_bucky_loop:
 
 	inx
 	asr                                ; ASR preserves most significant bit, but in our case it is 0
-	bcc m65_scnkey_bucky_next
+	bcc @1
 
 	; Bucky key pressed
 
-	pha
+	tay
 	lda kb_matrix_bucky_shflag, x
 	ora SHFLAG
 	sta SHFLAG
-	pla
-
-    ; FALLTROUGH
-
-m65_scnkey_bucky_next:
-
+	tya
+@1:
 	bne m65_scnkey_bucky_loop
 
+	; FALLTROUGH
+
+m65_scnkey_bucky_done:
+
 	; Set KEYTAB vector
 
 	lda KEYLOG+1