diff --git a/frontend/src/routes/_authenticated/tenants/$tenantId/devices/$deviceId.tsx b/frontend/src/routes/_authenticated/tenants/$tenantId/devices/$deviceId.tsx
index 9ba6f11..5e5fda0 100644
--- a/frontend/src/routes/_authenticated/tenants/$tenantId/devices/$deviceId.tsx
+++ b/frontend/src/routes/_authenticated/tenants/$tenantId/devices/$deviceId.tsx
@@ -302,7 +302,11 @@ function DeviceDetailPage() {
   const queryClient = useQueryClient()
   const { user } = useAuth()
   const [showCreds, setShowCreds] = useState(false)
-  const [activeTab, setActiveTab] = useState('overview')
+  const [activeTab, setActiveTabRaw] = useState('overview')
+  const setActiveTab = (tab: string) => {
+    setActiveTabRaw(tab)
+    document.getElementById('main-content')?.scrollTo(0, 0)
+  }
   const [editOpen, setEditOpen] = useState(false)
   const { mode, toggleMode } = useSimpleConfigMode(deviceId)