diff --git a/patches/ips/disableable_etanks.ips b/patches/ips/disableable_etanks.ips
index dfa0f2c29..72b6f5de8 100644
Binary files a/patches/ips/disableable_etanks.ips and b/patches/ips/disableable_etanks.ips differ
diff --git a/patches/ips/horizontal_door_fix.ips b/patches/ips/horizontal_door_fix.ips
index b52057d3a..850f68e16 100644
Binary files a/patches/ips/horizontal_door_fix.ips and b/patches/ips/horizontal_door_fix.ips differ
diff --git a/patches/src/disableable_etanks.asm b/patches/src/disableable_etanks.asm
index 0b7c54814..0ed12524e 100644
--- a/patches/src/disableable_etanks.asm
+++ b/patches/src/disableable_etanks.asm
@@ -443,6 +443,7 @@ org !bank_83_free_space_start
 
 etank_do_some_math:
     php
+    sei                         ; disable interrupts
     rep #$30
     
     lda $0755
@@ -485,6 +486,7 @@ etank_do_some_math:
     lda $809CCE,X ; There's a nice table here of E-Tank tile offsets that are convenient for our purposes
     sta !etank_hud_tile_offset
     
+    cli                         ; enable interrupts
     plp
     rtl
 
diff --git a/patches/src/horizontal_door_fix.asm b/patches/src/horizontal_door_fix.asm
index 12b814ab8..bb8ef046c 100644
--- a/patches/src/horizontal_door_fix.asm
+++ b/patches/src/horizontal_door_fix.asm
@@ -14,22 +14,24 @@ lorom
 !bank_84_free_space_end = $84f5a0
 
 org $848488
-    jsr clr_ints
+    jmp clr_ints
+clr_ret:
 
 org $8484e0
     jmp set_ints
+set_ret:
 
 org !bank_84_free_space_start
 clr_ints:
     sei           ; disable IRQ
     sta $4202     ; replaced code
-    rts
+    jmp clr_ret
 
 set_ints:
     cli           ; enable IRQ
     plx           ; replaced code
     ply
     plb
-    jmp $84e3
+    jmp set_ret
 
 warnpc !bank_84_free_space_end