diff --git a/frontend/src/components/FleetView.tsx b/frontend/src/components/FleetView.tsx
index f2eb70b6..661fe3a9 100644
--- a/frontend/src/components/FleetView.tsx
+++ b/frontend/src/components/FleetView.tsx
@@ -1,5 +1,5 @@
 import {
-    RefreshCw, RefreshCcwDot, Camera, FileDown,
+    RefreshCw, Camera, FileDown,
     Network, SlidersHorizontal,
     Send, KeyRound, ArrowLeftRight, Wrench, Workflow,
 } from 'lucide-react';
@@ -133,15 +133,6 @@ export function FleetView({ onNavigateToNode }: FleetViewProps) {
                         </TabsHighlight>
                     </TabsList>
                     <div className="flex items-center gap-2 max-md:w-full max-md:flex-wrap">
-                        <Button
-                            variant="outline"
-                            size="sm"
-                            onClick={updateStatus.checkUpdates}
-                            className="gap-2"
-                        >
-                            <RefreshCcwDot className="w-4 h-4" />
-                            Check Updates
-                        </Button>
                         <Button
                             variant="outline"
                             size="sm"
@@ -195,6 +186,8 @@ export function FleetView({ onNavigateToNode }: FleetViewProps) {
                         onEditNode={isAdmin ? openEdit : undefined}
                         onDeleteNode={isAdmin ? openDelete : undefined}
                         onAddNode={isAdmin ? openCreate : undefined}
+                        onCheckUpdates={updateStatus.checkUpdates}
+                        checkingUpdates={updateStatus.checkingUpdates}
                         topologyMode={topology.prefs.mode}
                         onTopologyModeChange={topology.setMode}
                         topologyPositions={topology.prefs.positions}
diff --git a/frontend/src/components/FleetView/OverviewTab.tsx b/frontend/src/components/FleetView/OverviewTab.tsx
index ca6f5f96..50cbaade 100644
--- a/frontend/src/components/FleetView/OverviewTab.tsx
+++ b/frontend/src/components/FleetView/OverviewTab.tsx
@@ -40,6 +40,8 @@ interface OverviewTabProps {
     topologyPositions: SavedPositions;
     onTopologyPositionsChange: (positions: SavedPositions) => void;
     onAddNode?: () => void;
+    onCheckUpdates?: () => void;
+    checkingUpdates?: boolean;
 }
 
 export function OverviewTab({
@@ -73,6 +75,8 @@ export function OverviewTab({
     topologyPositions,
     onTopologyPositionsChange,
     onAddNode,
+    onCheckUpdates,
+    checkingUpdates,
 }: OverviewTabProps) {
     return (
         <>
@@ -116,6 +120,8 @@ export function OverviewTab({
                         onLabelFiltersChange={onLabelFiltersChange}
                         onClearFilters={onClearFilters}
                         onAddNode={onAddNode}
+                        onCheckUpdates={onCheckUpdates}
+                        checkingUpdates={checkingUpdates}
                     />
 
                     {viewMode === 'topology' && processedNodes.length > 0 ? (
diff --git a/frontend/src/components/FleetView/OverviewToolbar.tsx b/frontend/src/components/FleetView/OverviewToolbar.tsx
index f6716f98..5d608742 100644
--- a/frontend/src/components/FleetView/OverviewToolbar.tsx
+++ b/frontend/src/components/FleetView/OverviewToolbar.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import {
     Search, ArrowUpDown, AlertTriangle, Play, Square,
-    LayoutGrid, Network, SlidersHorizontal, Plus,
+    LayoutGrid, Network, SlidersHorizontal, Plus, RefreshCcwDot,
 } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Badge } from '@/components/ui/badge';
@@ -50,6 +50,8 @@ interface OverviewToolbarProps {
     onLabelFiltersChange: (filters: Set<string>) => void;
     onClearFilters: () => void;
     onAddNode?: () => void;
+    onCheckUpdates?: () => void;
+    checkingUpdates?: boolean;
 }
 
 export function OverviewToolbar({
@@ -64,6 +66,8 @@ export function OverviewToolbar({
     onLabelFiltersChange,
     onClearFilters,
     onAddNode,
+    onCheckUpdates,
+    checkingUpdates,
 }: OverviewToolbarProps) {
     const showGridControls = viewMode === 'grid';
     const activeFilterCount =
@@ -257,6 +261,19 @@ export function OverviewToolbar({
                     Add node
                 </Button>
             )}
+
+            {onCheckUpdates && (
+                <Button
+                    variant="outline"
+                    size="sm"
+                    className="gap-2 shrink-0 h-9"
+                    onClick={onCheckUpdates}
+                    disabled={checkingUpdates}
+                >
+                    <RefreshCcwDot className={`w-4 h-4 ${checkingUpdates ? 'animate-spin' : ''}`} />
+                    Check Updates
+                </Button>
+            )}
         </div>
     );
 }
diff --git a/frontend/src/components/FleetView/__tests__/OverviewToolbar.test.tsx b/frontend/src/components/FleetView/__tests__/OverviewToolbar.test.tsx
index de4acf8b..8ea5cc5f 100644
--- a/frontend/src/components/FleetView/__tests__/OverviewToolbar.test.tsx
+++ b/frontend/src/components/FleetView/__tests__/OverviewToolbar.test.tsx
@@ -93,4 +93,21 @@ describe('OverviewToolbar', () => {
     render(<OverviewToolbar {...props()} />);
     expect(screen.queryByRole('button', { name: 'Add node' })).not.toBeInTheDocument();
   });
+
+  it('renders the Check Updates button and fires onCheckUpdates when provided', () => {
+    const onCheckUpdates = vi.fn();
+    render(<OverviewToolbar {...props({ onCheckUpdates })} />);
+    fireEvent.click(screen.getByRole('button', { name: /Check Updates/ }));
+    expect(onCheckUpdates).toHaveBeenCalledTimes(1);
+  });
+
+  it('omits the Check Updates button when onCheckUpdates is not provided', () => {
+    render(<OverviewToolbar {...props()} />);
+    expect(screen.queryByRole('button', { name: /Check Updates/ })).not.toBeInTheDocument();
+  });
+
+  it('disables the Check Updates button while a check is in flight', () => {
+    render(<OverviewToolbar {...props({ onCheckUpdates: vi.fn(), checkingUpdates: true })} />);
+    expect(screen.getByRole('button', { name: /Check Updates/ })).toBeDisabled();
+  });
 });