From 0ff644e842168945db086afc29c06ac3b5cb37ee Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Sat, 25 Oct 2025 17:18:42 -0700
Subject: [PATCH] Queue hiding when switching pages

---
 frontend/src/Activity/Queue/Queue.tsx          | 5 +++--
 frontend/src/Helpers/Hooks/usePagedApiQuery.ts | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/Activity/Queue/Queue.tsx b/frontend/src/Activity/Queue/Queue.tsx
index 720a2bc9c..8ee085568 100644
--- a/frontend/src/Activity/Queue/Queue.tsx
+++ b/frontend/src/Activity/Queue/Queue.tsx
@@ -63,7 +63,6 @@ function Queue() {
     totalRecords,
     error,
     isFetching,
-    isFetched,
     isLoading,
     page,
     goToPage,
@@ -108,8 +107,10 @@ function Queue() {
 
   const isRefreshing =
     isLoading || isEpisodesFetching || isRefreshMonitoredDownloadsExecuting;
+
+  // Use isLoading over isFetched to avoid losing the table UI when switching pages
   const isAllPopulated =
-    isFetched &&
+    !isLoading &&
     (isEpisodesPopulated ||
       !records.length ||
       records.every((e) => !e.episodeIds?.length));
diff --git a/frontend/src/Helpers/Hooks/usePagedApiQuery.ts b/frontend/src/Helpers/Hooks/usePagedApiQuery.ts
index d0dfc9368..f25932ca2 100644
--- a/frontend/src/Helpers/Hooks/usePagedApiQuery.ts
+++ b/frontend/src/Helpers/Hooks/usePagedApiQuery.ts
@@ -1,4 +1,4 @@
-import { useQuery } from '@tanstack/react-query';
+import { keepPreviousData, useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
 import { PropertyFilter } from 'App/State/AppState';
 import { SortDirection } from 'Helpers/Props/sortDirections';
@@ -89,6 +89,7 @@ const usePagedApiQuery = <T>(options: PagedQueryOptions<T>) => {
         ),
       };
     },
+    placeholderData: keepPreviousData,
   });
 
   return {