diff --git a/assets/components/FuzzySearchModal.spec.ts b/assets/components/FuzzySearchModal.spec.ts
index 5f48eca3..388a123c 100644
--- a/assets/components/FuzzySearchModal.spec.ts
+++ b/assets/components/FuzzySearchModal.spec.ts
@@ -33,7 +33,7 @@ function createFuzzySearchModal() {
               containers: [
                 new Container("123", new Date(), "image", "test", "command", "host", {}, "status", "running", []),
                 new Container("345", new Date(), "image", "foo bar", "command", "host", {}, "status", "running", []),
-                new Container("567", new Date(), "image", "baz", "command", "host", {}, "status", "exited", []),
+                new Container("567", new Date(), "image", "baz", "command", "host", {}, "status", "running", []),
               ],
             },
           },
@@ -56,7 +56,8 @@ describe("<FuzzySearchModal />", () => {
   beforeEach(() => {
     vi.mocked(useRouter().push).mockReset();
   });
-  test("shows all", async () => {
+
+  test("shows running all", async () => {
     const wrapper = createFuzzySearchModal();
     expect(wrapper.findAll("li").length).toBe(3);
   });
diff --git a/assets/components/FuzzySearchModal.vue b/assets/components/FuzzySearchModal.vue
index a271c1a9..d6ac8c2a 100644
--- a/assets/components/FuzzySearchModal.vue
+++ b/assets/components/FuzzySearchModal.vue
@@ -24,14 +24,23 @@
           :class="index === selectedIndex ? 'focus' : ''"
         >
           <div :class="{ 'text-primary': result.item.state === 'running' }">
-            <octicon:container-24 />
+            <template v-if="result.item.type === 'container'">
+              <octicon:container-24 />
+            </template>
+            <template v-else-if="result.item.type === 'service'">
+              <ph:stack-simple />
+            </template>
+            <template v-else-if="result.item.type === 'stack'">
+              <ph:stack />
+            </template>
           </div>
           <div class="truncate">
-            <template v-if="config.hosts.length > 1">
+            <template v-if="config.hosts.length > 1 && result.item.host">
               <span class="font-light">{{ result.item.host }}</span> /
             </template>
             <span data-name v-html="matchedName(result)"></span>
           </div>
+
           <DistanceTime :date="result.item.created" class="text-xs font-light" />
           <a
             @click.stop.prevent="addColumn(result.item)"
@@ -48,8 +57,9 @@
 </template>
 
 <script lang="ts" setup>
+import { ContainerState } from "@/types/Container";
 import { useFuse } from "@vueuse/integrations/useFuse";
-import { type FuseResultMatch } from "fuse.js";
+import { type FuseResult } from "fuse.js";
 
 const { maxResults = 5 } = defineProps<{
   maxResults?: number;
@@ -64,24 +74,60 @@ const selectedIndex = ref(0);
 const router = useRouter();
 const containerStore = useContainerStore();
 const pinnedStore = usePinnedLogsStore();
-const { containers } = storeToRefs(containerStore);
+const { visibleContainers } = storeToRefs(containerStore);
+
+const swarmStore = useSwarmStore();
+const { stacks, services } = storeToRefs(swarmStore);
+
+type Item = {
+  id: string;
+  created: Date;
+  name: string;
+  state?: ContainerState;
+  host?: string;
+  type: "container" | "service" | "stack";
+};
 
 const list = computed(() => {
-  return containers.value.map(({ id, created, name, state, labels, hostLabel: host }) => {
-    return {
-      id,
-      created,
-      name,
-      state,
-      host,
-      labels: Object.entries(labels).map(([_, value]) => value),
-    };
-  });
+  const items: Item[] = [];
+
+  for (const container of visibleContainers.value) {
+    items.push({
+      id: container.id,
+      created: container.created,
+      name: container.name,
+      state: container.state,
+      host: container.hostLabel,
+      type: "container",
+    });
+  }
+
+  for (const service of services.value) {
+    items.push({
+      id: service.name,
+      created: service.updatedAt,
+      name: service.name,
+      state: "running",
+      type: "service",
+    });
+  }
+
+  for (const stack of stacks.value) {
+    items.push({
+      id: stack.name,
+      created: stack.updatedAt,
+      name: stack.name,
+      state: "running",
+      type: "stack",
+    });
+  }
+
+  return items;
 });
 
 const { results } = useFuse(query, list, {
   fuseOptions: {
-    keys: ["name", "host", "labels"],
+    keys: ["name", "host"],
     includeScore: true,
     useExtendedSearch: true,
     threshold: 0.3,
@@ -93,17 +139,17 @@ const { results } = useFuse(query, list, {
 
 const data = computed(() => {
   return [...results.value]
-    .sort((a, b) => {
+    .sort((a: FuseResult<Item>, b: FuseResult<Item>) => {
       if (a.score === b.score) {
         if (a.item.state === b.item.state) {
-          return b.item.created - a.item.created;
+          return b.item.created.getTime() - a.item.created.getTime();
         } else if (a.item.state === "running" && b.item.state !== "running") {
           return -1;
         } else {
           return 1;
         }
       } else {
-        return a.score - b.score;
+        return (a.score ?? 0) - (b.score ?? 0);
       }
     })
     .slice(0, maxResults);
@@ -115,10 +161,16 @@ watch(query, (data) => {
   }
 });
 
-onMounted(() => input.value?.focus());
+useFocus(input, { initialValue: true });
 
-function selected({ id }: { id: string }) {
-  router.push({ name: "container-id", params: { id } });
+function selected(item: Item) {
+  if (item.type === "container") {
+    router.push({ name: "container-id", params: { id: item.id } });
+  } else if (item.type === "service") {
+    router.push({ name: "service-name", params: { name: item.id } });
+  } else if (item.type === "stack") {
+    router.push({ name: "stack-name", params: { name: item.id } });
+  }
   close();
 }
 function addColumn(container: { id: string }) {
@@ -126,7 +178,7 @@ function addColumn(container: { id: string }) {
   close();
 }
 
-function matchedName({ item, matches = [] }: { item: { name: string }; matches?: FuseResultMatch[] }) {
+function matchedName({ item, matches = [] }: FuseResult<Item>) {
   const matched = matches.find((match) => match.key === "name");
   if (matched) {
     const { indices } = matched;
diff --git a/assets/components/SideMenu.vue b/assets/components/SideMenu.vue
index cfc2c3c8..88069a20 100644
--- a/assets/components/SideMenu.vue
+++ b/assets/components/SideMenu.vue
@@ -20,6 +20,7 @@
 </template>
 
 <script lang="ts" setup>
+import { onBeforeRouteLeave } from "vue-router";
 const containerStore = useContainerStore();
 const { ready } = storeToRefs(containerStore);
 
@@ -27,5 +28,13 @@ const swarmStore = useSwarmStore();
 const { services, customGroups } = storeToRefs(swarmStore);
 
 const showSwarm = useSessionStorage<boolean>("DOZZLE_SWARM_MODE", false);
+
+onBeforeRouteLeave((to) => {
+  if (to.meta.swarmMode) {
+    showSwarm.value = true;
+  } else {
+    showSwarm.value = false;
+  }
+});
 </script>
 <style scoped lang="postcss"></style>
diff --git a/assets/models/Stack.ts b/assets/models/Stack.ts
index 8facc0fc..7bb774bb 100644
--- a/assets/models/Stack.ts
+++ b/assets/models/Stack.ts
@@ -10,6 +10,10 @@ export class Stack {
       service.stack = this;
     }
   }
+
+  get updatedAt() {
+    return this.containers.map((c) => c.created).reduce((acc, date) => (date > acc ? date : acc), new Date(0));
+  }
 }
 
 export class Service {
@@ -19,4 +23,8 @@ export class Service {
   ) {}
 
   stack?: Stack;
+
+  get updatedAt() {
+    return this.containers.map((c) => c.created).reduce((acc, date) => (date > acc ? date : acc), new Date(0));
+  }
 }
diff --git a/assets/pages/group/[name].vue b/assets/pages/group/[name].vue
index 499597a2..ec17cdf7 100644
--- a/assets/pages/group/[name].vue
+++ b/assets/pages/group/[name].vue
@@ -20,3 +20,7 @@ watchEffect(() => {
   }
 });
 </script>
+<route lang="yaml">
+meta:
+  swarmMode: true
+</route>
diff --git a/assets/pages/service/[name].vue b/assets/pages/service/[name].vue
index 2619e07e..d59816e1 100644
--- a/assets/pages/service/[name].vue
+++ b/assets/pages/service/[name].vue
@@ -26,3 +26,7 @@ watchEffect(() => {
   }
 });
 </script>
+<route lang="yaml">
+meta:
+  swarmMode: true
+</route>
diff --git a/assets/pages/stack/[name].vue b/assets/pages/stack/[name].vue
index b566f1ed..1e11c72e 100644
--- a/assets/pages/stack/[name].vue
+++ b/assets/pages/stack/[name].vue
@@ -26,3 +26,7 @@ watchEffect(() => {
   }
 });
 </script>
+<route lang="yaml">
+meta:
+  swarmMode: true
+</route>