diff --git a/src/ui.browse.mode.a b/src/ui.browse.mode.a
index b0c206aa8..2e05c5378 100644
--- a/src/ui.browse.mode.a
+++ b/src/ui.browse.mode.a
@@ -68,8 +68,12 @@ OnBrowseSearch
          jmp   SearchMode
 
 OnBrowsePrevious
-         +LDX16 gGameToLaunch
-         +CPX16_0_NE @notFirstGame
+         jsr   AnyGameSelected
+                                     ; A/Y = gGameToLaunch
+         bcs   @goToLastGame         ; if no game selected, select last game
+         tax                         ; X/Y = gGameToLaunch
+         +CPX16_0_NE @notFirstGame   ; if first game selected, select last game
+@goToLastGame
          +LDX16 GameCount
 @notFirstGame
          +DEX16