diff --git a/internal/view/seasonsview/fixture_detail.templ b/internal/view/seasonsview/fixture_detail.templ
index df25898..ce73499 100644
--- a/internal/view/seasonsview/fixture_detail.templ
+++ b/internal/view/seasonsview/fixture_detail.templ
@@ -520,32 +520,6 @@ templ fixtureResultDisplay(fixture *db.Fixture, result *db.FixtureResult) {
 }
 
 templ fixtureUploadPrompt(fixture *db.Fixture) {
-	<div class="bg-mantle border border-surface1 rounded-lg p-6 text-center">
-		<div class="text-4xl mb-3">📋</div>
-		<p class="text-lg text-text font-medium mb-2">No Result Uploaded</p>
-		<p class="text-sm text-subtext1 mb-4">Upload match log files to record the result of this fixture.</p>
-		<div class="flex items-center justify-center gap-3">
-			<a
-				href={ templ.SafeURL(fmt.Sprintf("/fixtures/%d/results/upload", fixture.ID)) }
-				class="inline-block px-4 py-2 bg-blue hover:bg-blue/80 text-mantle rounded-lg
-					font-medium transition hover:cursor-pointer"
-			>
-				Upload Match Logs
-			</a>
-			<button
-				type="button"
-				@click="$dispatch('open-forfeit-modal')"
-				class="inline-block px-4 py-2 bg-red hover:bg-red/80 text-mantle rounded-lg
-					font-medium transition hover:cursor-pointer"
-			>
-				Forfeit Match
-			</button>
-		</div>
-	</div>
-	@forfeitModal(fixture)
-}
-
-templ forfeitModal(fixture *db.Fixture) {
 	<div
 		x-data="{
 			open: false,
@@ -553,7 +527,35 @@ templ forfeitModal(fixture *db.Fixture) {
 			forfeitTeam: '',
 			forfeitReason: '',
 		}"
-		@open-forfeit-modal.window="open = true"
+	>
+		<div class="bg-mantle border border-surface1 rounded-lg p-6 text-center">
+			<div class="text-4xl mb-3">📋</div>
+			<p class="text-lg text-text font-medium mb-2">No Result Uploaded</p>
+			<p class="text-sm text-subtext1 mb-4">Upload match log files to record the result of this fixture.</p>
+			<div class="flex items-center justify-center gap-3">
+				<a
+					href={ templ.SafeURL(fmt.Sprintf("/fixtures/%d/results/upload", fixture.ID)) }
+					class="inline-block px-4 py-2 bg-blue hover:bg-blue/80 text-mantle rounded-lg
+						font-medium transition hover:cursor-pointer"
+				>
+					Upload Match Logs
+				</a>
+				<button
+					type="button"
+					@click="open = true"
+					class="inline-block px-4 py-2 bg-red hover:bg-red/80 text-mantle rounded-lg
+						font-medium transition hover:cursor-pointer"
+				>
+					Forfeit Match
+				</button>
+			</div>
+		</div>
+		@forfeitModal(fixture)
+	</div>
+}
+
+templ forfeitModal(fixture *db.Fixture) {
+	<div
 		x-show="open"
 		x-cloak
 		class="fixed inset-0 z-50 overflow-y-auto"