diff --git a/app/game/index.tsx b/app/game/index.tsx
index 6853850..4e53015 100644
--- a/app/game/index.tsx
+++ b/app/game/index.tsx
@@ -31,6 +31,7 @@ export default function GamePage() {
           animationDuration: 0,
           animationTypeForReplace: "push",
           animation: "flip",
+          gestureEnabled: false,
         }}
       />
       <Suspense fallback={<ActivityIndicator />}>
diff --git a/app/game/post-match.tsx b/app/game/post-match.tsx
index 1d7f24b..9bd16ec 100644
--- a/app/game/post-match.tsx
+++ b/app/game/post-match.tsx
@@ -53,6 +53,7 @@ export default function PostMatch() {
           animationDuration: 0,
           animationTypeForReplace: "push",
           animation: "flip",
+          gestureEnabled: false,
         }}
       />
       <NavBar title="Post match" />
diff --git a/app/game/submit.tsx b/app/game/submit.tsx
index 8ed37aa..3b64239 100644
--- a/app/game/submit.tsx
+++ b/app/game/submit.tsx
@@ -11,7 +11,7 @@ import {
 } from "../../lib/models/match";
 import { Suspense, useEffect, useState } from "react";
 import { ScoutReport } from "../../lib/collection/ScoutReport";
-import { router } from "expo-router";
+import { router, Stack } from "expo-router";
 import { uploadReport } from "../../lib/lovatAPI/uploadReport";
 import { Icon } from "../../lib/components/Icon";
 import { useHistoryStore } from "../../lib/storage/historyStore";
@@ -72,6 +72,14 @@ export default function Submit() {
 
   return (
     <>
+      <Stack.Screen
+        options={{
+          animationDuration: 0,
+          animationTypeForReplace: "push",
+          animation: "flip",
+          gestureEnabled: false,
+        }}
+      />
       <NavBar
         title={`${reportState.meta!.teamNumber} in ${localizeMatchIdentity(reportState.meta!.matchIdentity, MatchIdentityLocalizationFormat.Short)}`}
       />
diff --git a/app/home.tsx b/app/home.tsx
index 96b2b50..a61043b 100644
--- a/app/home.tsx
+++ b/app/home.tsx
@@ -72,7 +72,7 @@ export default function Home() {
   useEffect(() => {
     if (!reportState.meta) return;
 
-    router.replace("/game");
+    router.push("/game");
   }, [reportState.meta]);
 
   return (
diff --git a/lib/collection/ui/Game.tsx b/lib/collection/ui/Game.tsx
index e3433a9..4384deb 100644
--- a/lib/collection/ui/Game.tsx
+++ b/lib/collection/ui/Game.tsx
@@ -101,11 +101,28 @@ export function Game() {
       gamePhaseMessage: "Pre-Match",
       field: <PreMatchActions />,
       topLeftReplacement: (
-        <Checkbox
-          label="Loaded with a coral"
-          checked={reportState?.startPiece}
-          onChange={reportState.setStartPiece}
-        />
+        <View style={{ flexDirection: "row", alignItems: "center", gap: 8 }}>
+          {router.canGoBack() && (
+            <TouchableOpacity
+              onPress={() => {
+                reportState.reset();
+                router.back();
+              }}
+              style={{ padding: 8 }}
+            >
+              <Icon
+                name="arrow_back_ios"
+                size={24}
+                color={colors.onBackground.default}
+              />
+            </TouchableOpacity>
+          )}
+          <Checkbox
+            label="Loaded with a coral"
+            checked={reportState?.startPiece}
+            onChange={reportState.setStartPiece}
+          />
+        </View>
       ),
       startEnabled: reportState.startPosition !== undefined,
     },