diff --git a/src/ui/save-slot-select-ui-handler.ts b/src/ui/save-slot-select-ui-handler.ts
index d0ae3539ae3..681082c3a89 100644
--- a/src/ui/save-slot-select-ui-handler.ts
+++ b/src/ui/save-slot-select-ui-handler.ts
@@ -168,8 +168,9 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler {
         }
         break;
       case Button.RIGHT:
-        if (this.sessionSlots[cursorPosition].hasData) {
+        if (this.sessionSlots[cursorPosition].hasData && this.sessionSlots[cursorPosition].saveData) {
           this.scene.ui.setOverlayMode(Mode.RUN_INFO, this.sessionSlots[cursorPosition].saveData, RunDisplayMode.SESSION_PREVIEW);
+          success = true;
         }
       }
     }