diff --git a/assets/components/ContainerViewer/ContainerTitle.vue b/assets/components/ContainerViewer/ContainerTitle.vue
index 0b9fd33fca18..a67cda235fa1 100644
--- a/assets/components/ContainerViewer/ContainerTitle.vue
+++ b/assets/components/ContainerViewer/ContainerTitle.vue
@@ -12,10 +12,12 @@
             {{ container.hostLabel }}
           </li>
           <li>
-            <div class="wrapper" ref="wrapper">
+            <div v-if="otherContainers.length === 0" class="font-mono">{{ container.name }}</div>
+            <div class="wrapper" ref="wrapper" v-else>
               <button popovertarget="popover-container-list" class="btn btn-xs md:btn-sm anchor font-mono">
                 {{ container.name }} <carbon:caret-down />
               </button>
+
               <ul popover id="popover-container-list" class="dropdown menu rounded-box bg-base-100 tethered shadow-sm">
                 <li v-for="other in otherContainers">
                   <router-link :to="{ name: '/container/[id]', params: { id: other.id } }">
diff --git a/assets/components/HostMenu.vue b/assets/components/HostMenu.vue
index d51523a7c23e..7e5532e80fc1 100644
--- a/assets/components/HostMenu.vue
+++ b/assets/components/HostMenu.vue
@@ -80,8 +80,12 @@
                     active-class="menu-active"
                     @click.alt.stop.prevent="pinnedStore.pinContainer(item)"
                     :title="item.name"
-                    class="group auto-cols-[auto_max-content_max-content]"
+                    class="group auto-cols-[content_max_auto_max-content_max-content]"
                   >
+                    <div
+                      class="status data-[state=exited]:status-error data-[state=running]:status-success"
+                      :data-state="item.state"
+                    ></div>
                     <div class="truncate">
                       {{ item.name }}
                     </div>
@@ -215,7 +219,7 @@ const toggleShowAllContainers = () => (showAllContainers.value = !showAllContain
 }
 
 li.exited {
-  @apply opacity-50;
+  @apply opacity-75;
 }
 
 li.deleted {
diff --git a/e2e/visual.spec.ts-snapshots/dark-homepage-1-Mobile-Chrome-linux.png b/e2e/visual.spec.ts-snapshots/dark-homepage-1-Mobile-Chrome-linux.png
index 2d4039cbef65..1a86403107de 100644
Binary files a/e2e/visual.spec.ts-snapshots/dark-homepage-1-Mobile-Chrome-linux.png and b/e2e/visual.spec.ts-snapshots/dark-homepage-1-Mobile-Chrome-linux.png differ
diff --git a/e2e/visual.spec.ts-snapshots/dark-homepage-1-chromium-linux.png b/e2e/visual.spec.ts-snapshots/dark-homepage-1-chromium-linux.png
index 8e1ff9ac9c1b..1d60b75334a8 100644
Binary files a/e2e/visual.spec.ts-snapshots/dark-homepage-1-chromium-linux.png and b/e2e/visual.spec.ts-snapshots/dark-homepage-1-chromium-linux.png differ
diff --git a/e2e/visual.spec.ts-snapshots/default-homepage-1-Mobile-Chrome-linux.png b/e2e/visual.spec.ts-snapshots/default-homepage-1-Mobile-Chrome-linux.png
index cb8474fe062b..8273ec6d85f1 100644
Binary files a/e2e/visual.spec.ts-snapshots/default-homepage-1-Mobile-Chrome-linux.png and b/e2e/visual.spec.ts-snapshots/default-homepage-1-Mobile-Chrome-linux.png differ
diff --git a/e2e/visual.spec.ts-snapshots/default-homepage-1-chromium-linux.png b/e2e/visual.spec.ts-snapshots/default-homepage-1-chromium-linux.png
index 1f2036883efe..b607e9a43a94 100644
Binary files a/e2e/visual.spec.ts-snapshots/default-homepage-1-chromium-linux.png and b/e2e/visual.spec.ts-snapshots/default-homepage-1-chromium-linux.png differ