diff --git a/frontend/src/components/alert/details.tsx b/frontend/src/components/alert/details.tsx
index 747367eed..396631e02 100644
--- a/frontend/src/components/alert/details.tsx
+++ b/frontend/src/components/alert/details.tsx
@@ -58,7 +58,7 @@ export const AlertDetailsDialogContent = ({
   return (
     <DialogContent className="w-[90vw] max-w-[900px]">
       <DialogHeader>
-        <div className="flex items-center gap-4">
+        <div className="flex items-center gap-4 flex-wrap">
           <ResourceLink
             type={alert.target.type as UsableResource}
             id={alert.target.id}
@@ -71,7 +71,7 @@ export const AlertDetailsDialogContent = ({
       </DialogHeader>
       <DialogDescription>
         <div className="flex flex-col gap-4">
-          <div className="flex gap-4 items-center">
+          <div className="flex gap-4 items-center flex-wrap">
             {/** Alert type */}
             <div className="flex gap-2">
               <div className="text-muted-foreground">type:</div>{" "}
diff --git a/frontend/src/components/resources/server/tabs.tsx b/frontend/src/components/resources/server/tabs.tsx
index 3307ee8b5..7d2340170 100644
--- a/frontend/src/components/resources/server/tabs.tsx
+++ b/frontend/src/components/resources/server/tabs.tsx
@@ -15,6 +15,7 @@ import { StackTable } from "../stack/table";
 import { RepoTable } from "../repo/table";
 import { ServerTerminals } from "@components/terminal/server";
 import { Card, CardHeader, CardTitle } from "@ui/card";
+import { Types } from "komodo_client";
 
 type ServerTabView = "Config" | "Stats" | "Docker" | "Resources" | "Terminals";
 
@@ -65,7 +66,7 @@ export const ServerTabs = ({ id }: { id: string }) => {
       },
       {
         value: "Terminals",
-        hidden:
+        disabled:
           !specificTerminal ||
           (terminals_disabled && container_terminals_disabled),
       },
@@ -170,36 +171,48 @@ const ServerTabsTerminals = ({
 }) => {
   const { specificTerminal } = usePermissions({ type: "Server", id });
   const server_info = useServer(id)?.info;
+  const state = server_info?.state ?? Types.ServerState.NotOk;
   const terminals_disabled = server_info?.terminals_disabled ?? true;
   const container_terminals_disabled =
     server_info?.container_terminals_disabled ?? true;
 
-  return (
-    <>
-      {(!terminals_disabled || !container_terminals_disabled) &&
-        specificTerminal && <ServerTerminals id={id} titleOther={Selector} />}
-      {terminals_disabled &&
-        container_terminals_disabled &&
-        specificTerminal && (
-          <Section titleOther={Selector}>
-            <Card>
-              <CardHeader>
-                <CardTitle>Terminals are disabled on this Server.</CardTitle>
-              </CardHeader>
-            </Card>
-          </Section>
-        )}
-      {!specificTerminal && (
-        <Section titleOther={Selector}>
-          <Card>
-            <CardHeader>
-              <CardTitle>
-                User does not have permission to use Terminals.
-              </CardTitle>
-            </CardHeader>
-          </Card>
-        </Section>
-      )}
-    </>
-  );
+  if (!specificTerminal) {
+    return (
+      <Section titleOther={Selector}>
+        <Card>
+          <CardHeader>
+            <CardTitle>
+              User does not have permission to use Terminals on this Server.
+            </CardTitle>
+          </CardHeader>
+        </Card>
+      </Section>
+    );
+  }
+
+  if (state !== Types.ServerState.Ok) {
+    return (
+      <Section titleOther={Selector}>
+        <Card>
+          <CardHeader>
+            <CardTitle>Server is not connected</CardTitle>
+          </CardHeader>
+        </Card>
+      </Section>
+    );
+  }
+
+  if (terminals_disabled && container_terminals_disabled) {
+    return (
+      <Section titleOther={Selector}>
+        <Card>
+          <CardHeader>
+            <CardTitle>Terminals are disabled on this Server.</CardTitle>
+          </CardHeader>
+        </Card>
+      </Section>
+    );
+  }
+
+  return <ServerTerminals id={id} titleOther={Selector} />;
 };
diff --git a/frontend/src/components/topbar/components.tsx b/frontend/src/components/topbar/components.tsx
index 9bb3b0aea..be2b174f7 100644
--- a/frontend/src/components/topbar/components.tsx
+++ b/frontend/src/components/topbar/components.tsx
@@ -503,7 +503,7 @@ export const TopbarAlerts = () => {
           {data?.alerts.map((alert) => (
             <DropdownMenuItem
               key={alert._id?.$oid}
-              className="flex items-center gap-8 border-b last:border-none cursor-pointer"
+              className="flex items-center gap-8 border-b last:border-none cursor-pointer max-w-[100vw]"
               onClick={() => setAlert(alert)}
             >
               <div className="w-24">