diff --git a/src/components/launch/LaunchWindow.tsx b/src/components/launch/LaunchWindow.tsx
index 09cca63ef..9f0a1b3af 100644
--- a/src/components/launch/LaunchWindow.tsx
+++ b/src/components/launch/LaunchWindow.tsx
@@ -83,6 +83,7 @@ function LaunchWindowContent() {
 	const { elapsed, formatTime } = useRecordingTimer(recording, paused);
 	const hudContentRef = useRef<HTMLDivElement>(null);
 	const hudBarRef = useRef<HTMLDivElement>(null);
+	const pendingAutoStartRef = useRef(false);
 
 	const {
 		selectedSource,
@@ -162,6 +163,12 @@ function LaunchWindowContent() {
 		};
 	}, []);
 
+	useEffect(() => {
+		if (openId !== "sources") {
+			pendingAutoStartRef.current = false;
+		}
+	}, [openId]);
+
 	const {
 		recordingHudOffset,
 		isHudDragging,
@@ -226,7 +233,13 @@ function LaunchWindowContent() {
 				<>
 					<SourcePopover
 						selectedSource={selectedSource}
-						onSourceSelect={handleSourceSelect}
+						onSourceSelect={async (source) => {
+							await handleSourceSelect(source);
+							if (pendingAutoStartRef.current) {
+								pendingAutoStartRef.current = false;
+								void toggleRecording();
+							}
+						}}
 						onOpen={beginInteractiveHudAction}
 						trigger={
 							<Button
@@ -353,6 +366,7 @@ function LaunchWindowContent() {
 						: () => {
 								beginInteractiveHudAction();
 								requestOpen("sources");
+								pendingAutoStartRef.current = true;
 							}
 				}
 				disabled={countdownActive}