diff --git a/main.s65 b/main.s65
index 872ca6d..ff670cd 100644
--- a/main.s65
+++ b/main.s65
@@ -74,7 +74,6 @@ irq:
     bbr7 irq_via_ifr,@irq_return    ; skip
     bbs2 irq_via_ifr,@irq_spi_p     ; check SR
     bbs1 irq_via_ifr,@irq_keypad    ; check CA1
-
     ; this SHOULD never be reached
     jsr lcd::clear
     Print "Unknown IRQ"
@@ -85,8 +84,11 @@ irq:
     rti
     ; bra @irq_return
 @irq_keypad:
-    jsr kp::read_irq
-    bra @irq_return
+    lda #<@irq_return
+    pha
+    lda #>@irq_return
+    pha
+    jmp (spi_p::irq_handler)
 @irq_spi_p:
     jsr spi_p::read
     bra @irq_return