From fb39e999c304f7fee22f89197cd367dd3faff300 Mon Sep 17 00:00:00 2001
From: IAvecilla <ignacio.avecilla@lambdaclass.com>
Date: Fri, 22 May 2026 21:18:41 -0300
Subject: [PATCH 1/2] Check for null instead of 0 to avoid false positives with
 first index

---
 packages/app/src/views/JellyseerrDetails/JellyseerrDetails.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/app/src/views/JellyseerrDetails/JellyseerrDetails.js b/packages/app/src/views/JellyseerrDetails/JellyseerrDetails.js
index 6157a81..286158e 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);

From eff942a8418edc437423d56fa18b7166f8560665 Mon Sep 17 00:00:00 2001
From: IAvecilla <ignacio.avecilla@lambdaclass.com>
Date: Fri, 22 May 2026 21:33:37 -0300
Subject: [PATCH 2/2] Fix layout for request cancel pop up

---
 .../JellyseerrDetails/JellyseerrDetails.js      | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/app/src/views/JellyseerrDetails/JellyseerrDetails.js b/packages/app/src/views/JellyseerrDetails/JellyseerrDetails.js
index 286158e..00e19a2 100644
--- a/packages/app/src/views/JellyseerrDetails/JellyseerrDetails.js
+++ b/packages/app/src/views/JellyseerrDetails/JellyseerrDetails.js
@@ -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>