diff --git a/www/src/components/clusters/ClustersContent.tsx b/www/src/components/clusters/ClustersContent.tsx
index 7e91a385c..87f39de1e 100644
--- a/www/src/components/clusters/ClustersContent.tsx
+++ b/www/src/components/clusters/ClustersContent.tsx
@@ -80,6 +80,7 @@ export function ClustersContent(): ReactElement | null {
       </PageTitle>
       <UpgradesList
         upgrades={data.upgradeQueue?.upgrades}
+        acked={data.upgradeQueue?.acked}
         loading={loading}
         fetchMore={fetchMore}
       />
@@ -88,10 +89,10 @@ export function ClustersContent(): ReactElement | null {
 }
 
 function UpgradesList({
-  upgrades, loading, fetchMore,
+  upgrades, acked, loading, fetchMore,
 }): ReactElement {
   const [listRef, setListRef] = useState(null)
-  const { edges, pageInfo, acked } = upgrades
+  const { edges, pageInfo } = upgrades
 
   return (
     <Flex
diff --git a/www/src/components/clusters/ClustersSidenav.tsx b/www/src/components/clusters/ClustersSidenav.tsx
index 7d655db00..dafc12caa 100644
--- a/www/src/components/clusters/ClustersSidenav.tsx
+++ b/www/src/components/clusters/ClustersSidenav.tsx
@@ -29,6 +29,13 @@ export function ClustersSidenav({
     onQueueChange(queue)
   }
 
+  // Update selected queue if queues are updated
+  useEffect(() => {
+    const queue = queues.find(q => q.id === selectedKey.id)
+
+    setSelectedKey(queue)
+  }, [queues, selectedKey, setSelectedKey])
+
   return (
     <Flex
       gap={24}