diff --git a/scorch.asm b/scorch.asm
index f7e0527..9765aee 100644
--- a/scorch.asm
+++ b/scorch.asm
@@ -484,6 +484,7 @@ checkSelectKey
       beq SelectPressed
       lda CONSOL
       and #%00000100           ; Option
+      beq OptionPressed
     .ENDIF
     lda #@kbcode._none
     bne getkeyend
diff --git a/scorch.xex b/scorch.xex
index 13a75dc..77b7d5c 100644
Binary files a/scorch.xex and b/scorch.xex differ
diff --git a/weapons.asm b/weapons.asm
index 4268678..9e3c563 100644
--- a/weapons.asm
+++ b/weapons.asm
@@ -1224,17 +1224,11 @@ notpressed
     spl:rts ; exit if pressed 'Exit keys'
 
     ldx TankNr    ; for optimize
-    ; Select and Option
-    lda CONSOL
-    tay
-    and #%00000100
-    beq callActivation    ; Option key
-    tya
-    and #%00000010
-    jeq pressedTAB    ; Select key
     jsr GetKeyFast
     and #%10111111 ; SHIFT elimination
     
+    cmp #@kbcode._atari        ; Option key
+    beq callActivation
     cmp #@kbcode._A  ; $3f  ; A
     bne @+
 callActivation