diff --git a/packages/app/src/views/JellyseerrDetails/JellyseerrDetails.js b/packages/app/src/views/JellyseerrDetails/JellyseerrDetails.js
index 6157a81..00e19a2 100644
--- a/packages/app/src/views/JellyseerrDetails/JellyseerrDetails.js
+++ b/packages/app/src/views/JellyseerrDetails/JellyseerrDetails.js
@@ -483,7 +483,7 @@ const AdvancedOptionsPopup = memo(({open, title, servers, is4k, onConfirm, onClo
 	}, [open, availableServers]);
 
 	useEffect(() => {
-		if (!selectedServerId || !open) return;
+		if (selectedServerId == null || !open) return;
 
 		const loadServerDetails = async () => {
 			setLoadingDetails(true);
@@ -655,18 +655,29 @@ const CancelRequestPopup = memo(({open, pendingRequests, title, onConfirm, onClo
 		return $L('Cancel {parts} requests for "{title}"?').replace('{parts}', partsStr).replace('{title}', title);
 	}, [pendingRequests, title]);
 
+	useEffect(() => {
+		if (!open) return;
+		window.requestAnimationFrame(() => {
+			safeFocus('cancel-request-keep');
+		});
+	}, [open]);
+
 	return (
 		<Popup open={open} onClose={onClose} position="center" className={css.cancelPopup}>
 			<div className={css.cancelPopupContent}>
 				<h2 className={css.cancelPopupTitle}>{$L('Cancel Request')}</h2>
 				<p className={css.cancelPopupDescription}>{description}</p>
 				<div className={css.cancelButtons}>
+					<Button
+						className={css.cancelKeepButton}
+						spotlightId="cancel-request-keep"
+						onClick={onClose}
+					>
+						{$L('Keep Request')}
+					</Button>
 					<Button className={css.cancelConfirmButton} onClick={onConfirm}>
 						{$L('Cancel Request')}
 					</Button>
-					<Button className={css.cancelKeepButton} onClick={onClose}>
-						{$L('Keep Request')}
-					</Button>
 				</div>
 			</div>
 		</Popup>