diff --git a/src/constants.a b/src/constants.a
index 8a597c095..4f55234ea 100644
--- a/src/constants.a
+++ b/src/constants.a
@@ -9,7 +9,7 @@
 ; D000..E611 - persistent data structures (per-game cheat categories,
 ;              gGlobalPrefsStore, gGamesListStore)
 ; ...unused...
-; EBF2..FFF9 - main program code
+; EBF5..FFF9 - main program code
 ; FFFA..FFFF - NMI, reset, IRQ vectors
 ;
 ; LC RAM BANK 2
diff --git a/src/ui.animation.a b/src/ui.animation.a
index a2b0964dd..b3ca1cdaa 100644
--- a/src/ui.animation.a
+++ b/src/ui.animation.a
@@ -7,6 +7,7 @@
 ;
 
 MaybeAnimateTitle
+; out:   C clear
          lda   OffscreenPage
          bne   +
          lda   #$5F
@@ -18,9 +19,7 @@ MaybeAnimateTitle
          ldy   #0
          lda   (SAVE),y              ; see if there is a hidden JMP to an
          cmp   #$4C                  ; animation routine for this screen
-         beq   +
-         rts
-+
+         bne   @exit
          ldx   #$20                  ; copy new HGR screen to the other
          ldy   #$40
          lda   OffscreenPage
@@ -65,7 +64,7 @@ MaybeAnimateTitle
 
          jsr   Launch
          jsr   ResyncPage
-         clc                         ; tell caller not to refresh screen
+@exit    clc                         ; tell caller not to refresh screen
          rts
 
 @titleAnimPrelaunch
diff --git a/src/ui.search.mode.a b/src/ui.search.mode.a
index bf56456a7..bf7cd48e2 100644
--- a/src/ui.search.mode.a
+++ b/src/ui.search.mode.a
@@ -156,9 +156,7 @@ OnError
 @noload  jsr   DrawUI
          jsr   SwitchToBank2
          jsr   DisableAcceleratorAndSwitchToBank1
-         jsr   MaybeAnimateTitle
-         clc
-         rts
+         jmp   MaybeAnimateTitle
 
 ;------------------------------------------------------------------------------
 ; IsSearchKey