diff --git a/app/features/tournament-bracket/components/BracketMapListDialog.tsx b/app/features/tournament-bracket/components/BracketMapListDialog.tsx
index 4784a3209..5555276cd 100644
--- a/app/features/tournament-bracket/components/BracketMapListDialog.tsx
+++ b/app/features/tournament-bracket/components/BracketMapListDialog.tsx
@@ -44,13 +44,11 @@ import {
 import styles from "./BracketMapListDialog.module.css";
 
 export function BracketMapListDialog({
-	isOpen,
 	close,
 	bracket,
 	bracketIdx,
 	isPreparing,
 }: {
-	isOpen: boolean;
 	close: () => void;
 	bracket: Bracket;
 	bracketIdx: number;
@@ -294,7 +292,7 @@ export function BracketMapListDialog({
 	return (
 		<SendouDialog
 			heading={`Maplist selection (${bracket.name})`}
-			isOpen={isOpen}
+			isOpen
 			onClose={close}
 			isFullScreen
 		>
diff --git a/app/features/tournament-bracket/routes/to.$id.brackets.tsx b/app/features/tournament-bracket/routes/to.$id.brackets.tsx
index d9b53c385..0658a4a32 100644
--- a/app/features/tournament-bracket/routes/to.$id.brackets.tsx
+++ b/app/features/tournament-bracket/routes/to.$id.brackets.tsx
@@ -293,13 +293,11 @@ function BracketStarter({
 
 	return (
 		<>
-			{isMounted ? (
+			{isMounted && dialogOpen ? (
 				<BracketMapListDialog
-					isOpen={dialogOpen}
 					close={close}
 					bracket={bracket}
 					bracketIdx={bracketIdx}
-					key={bracketIdx}
 				/>
 			) : null}
 			<SendouButton
@@ -340,14 +338,12 @@ function MapPreparer({
 
 	return (
 		<>
-			{isMounted ? (
+			{isMounted && dialogOpen ? (
 				<BracketMapListDialog
-					isOpen={dialogOpen}
 					close={close}
 					bracket={bracket}
 					bracketIdx={bracketIdx}
 					isPreparing
-					key={bracketIdx}
 				/>
 			) : null}
 			<div className="stack sm horizontal ml-auto">