diff --git a/bugfixes.asm b/bugfixes.asm
index e9cb94e..cdc74c8 100644
--- a/bugfixes.asm
+++ b/bugfixes.asm
@@ -238,6 +238,18 @@ FixJingleGlitch:
 .exit
 	RTL
 ;--------------------------------------------------------------------------------
+FixSwimBump:
+	LDA.b LinkIncapacitatedTimer : BEQ .normal
+	LDA.b LinkJumping : BNE .normal
+	INC.b LinkJumping
+	BRA .not_diving
+.normal
+	LDA.b LinkJumping : BNE .continue ; what we wrote over
+.not_diving
+	PLA : PLA : PEA.w $87964E ; skip ahead, not diving
+.continue
+	RTL
+;--------------------------------------------------------------------------------
 ; Fix spawning with more hearts than capacity when less than 3 heart containers
 pushpc
         org $09F4AC ; <- module_death.asm:331
diff --git a/hooks.asm b/hooks.asm
index 935cf0a..bc72c8d 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -2107,6 +2107,11 @@ JSL FlipperScrollWarp
 ;--------------------------------------------------------------------------------
 ;org $878F51 ; <- 38F51 - Bank07.asm:2444 (JSR $AE54 ; $3AE54 IN ROM)
 ;JSL OnEnterWater : NOP
+;--------------------------------------------------------------------------------
+; Fixes getting bumped while swimming, unable to screen transition
+org $879632
+LinkState_Swimming:
+JSL FixSwimBump
 ;================================================================================
 ; Floodgate Softlock Fix
 ;--------------------------------------------------------------------------------