diff --git a/clients/web/src/components/elements/ContentViewer/ContentViewer.test.tsx b/clients/web/src/components/elements/ContentViewer/ContentViewer.test.tsx
index 4af024d5..7c2733a3 100644
--- a/clients/web/src/components/elements/ContentViewer/ContentViewer.test.tsx
+++ b/clients/web/src/components/elements/ContentViewer/ContentViewer.test.tsx
@@ -120,6 +120,34 @@ describe("ContentViewer", () => {
     expect(screen.queryByRole("button")).not.toBeInTheDocument();
   });
 
+  it("renders plain text in a wrapping code block by default", () => {
+    const block: ContentBlock = { type: "text", text: "some long command" };
+    const { container } = renderWithMantine(<ContentViewer block={block} />);
+    expect(container.querySelector(".mantine-Code-root")).toHaveAttribute(
+      "data-variant",
+      "wrapping",
+    );
+  });
+
+  it("renders plain text in a non-wrapping code block when wrap is false", () => {
+    const block: ContentBlock = { type: "text", text: "some long command" };
+    const { container } = renderWithMantine(
+      <ContentViewer block={block} wrap={false} />,
+    );
+    const code = container.querySelector(".mantine-Code-root");
+    expect(code).toHaveAttribute("data-variant", "nowrap");
+    // Full value exposed on hover since it may be clipped with an ellipsis.
+    expect(code).toHaveAttribute("title", "some long command");
+  });
+
+  it("does not set a title tooltip when wrapping (default)", () => {
+    const block: ContentBlock = { type: "text", text: "some long command" };
+    const { container } = renderWithMantine(<ContentViewer block={block} />);
+    expect(container.querySelector(".mantine-Code-root")).not.toHaveAttribute(
+      "title",
+    );
+  });
+
   it("renders text as markdown when mimeType is text/markdown", () => {
     const block: ContentBlock = {
       type: "text",
diff --git a/clients/web/src/components/elements/ContentViewer/ContentViewer.tsx b/clients/web/src/components/elements/ContentViewer/ContentViewer.tsx
index 8ab5a60b..be37a0fa 100644
--- a/clients/web/src/components/elements/ContentViewer/ContentViewer.tsx
+++ b/clients/web/src/components/elements/ContentViewer/ContentViewer.tsx
@@ -14,6 +14,19 @@ export interface ContentViewerProps {
    * instead of as preformatted code.
    */
   mimeType?: string;
+  /**
+   * Whether long plain-text content wraps onto multiple lines. When `false`,
+   * text is kept to a single line (overflow clipped with an ellipsis) so the
+   * viewer keeps a fixed height — used by hosts like the server card where the
+   * box height must stay constant regardless of command/URL length. The full
+   * value remains available via the copy button (and a native `title`
+   * tooltip). Defaults to `true`.
+   *
+   * Intended for single-line values only: `false` applies `white-space:
+   * nowrap`, which collapses embedded newlines (e.g. pretty-printed JSON) onto
+   * one line — don't pass it for multi-line content.
+   */
+  wrap?: boolean;
 }
 
 function formatJson(content: string): string {
@@ -66,6 +79,7 @@ export function ContentViewer({
   block,
   copyable = false,
   mimeType,
+  wrap = true,
 }: ContentViewerProps) {
   switch (block.type) {
     case "text": {
@@ -93,7 +107,14 @@ export function ContentViewer({
       return (
         <Stack gap="xs">
           <ContentWrapper>
-            <Code block p={36} variant="wrapping">
+            <Code
+              block
+              p={36}
+              variant={wrap ? "wrapping" : "nowrap"}
+              // When not wrapping, the value may be clipped with an ellipsis;
+              // expose the full text on hover so it's readable without copying.
+              title={wrap ? undefined : displayText}
+            >
               {displayText}
             </Code>
             {copyable && (
diff --git a/clients/web/src/components/groups/ServerCard/ServerCard.tsx b/clients/web/src/components/groups/ServerCard/ServerCard.tsx
index 864ccf6a..1c3c3482 100644
--- a/clients/web/src/components/groups/ServerCard/ServerCard.tsx
+++ b/clients/web/src/components/groups/ServerCard/ServerCard.tsx
@@ -202,6 +202,7 @@ export function ServerCard({
             <ContentViewer
               block={{ type: "text", text: commandOrUrl }}
               copyable
+              wrap={false}
             />
 
             <Group justify="space-between">
diff --git a/clients/web/src/components/screens/ServerListScreen/ServerListScreen.tsx b/clients/web/src/components/screens/ServerListScreen/ServerListScreen.tsx
index e0e31e1f..4a94fbfc 100644
--- a/clients/web/src/components/screens/ServerListScreen/ServerListScreen.tsx
+++ b/clients/web/src/components/screens/ServerListScreen/ServerListScreen.tsx
@@ -147,7 +147,17 @@ export function ServerListScreen({
 
   const grid = (
     <SimpleGrid
-      cols={{ base: 1, sm: 2, lg: 3 }}
+      // Container queries (not viewport) so column count tracks the actual
+      // space the grid occupies. The 2- and 3-column thresholds (1040px /
+      // 1560px) keep each card ≥ ~505px wide at the switch point: container =
+      // N·card + (N−1)·gap with gap = lg spacing (20px), i.e. 1040 = 2·510+20
+      // and 1560 = 3·507+40. Below ~500px a connected card's action row
+      // (Clone/Edit/Remove + Connection Info/Settings, ~440px with padding)
+      // wraps and stacks, making that card taller than its neighbours; dropping
+      // to fewer, wider columns instead keeps every card the same height.
+      // (#1528)
+      type="container"
+      cols={{ base: 1, "1040px": 2, "1560px": 3 }}
       spacing="lg"
       className="grid-align-start"
     >
diff --git a/clients/web/src/theme/Code.ts b/clients/web/src/theme/Code.ts
index 77609c59..7910c7f7 100644
--- a/clients/web/src/theme/Code.ts
+++ b/clients/web/src/theme/Code.ts
@@ -9,6 +9,14 @@ export const ThemeCode = Code.extend({
       root.wordBreak = "break-all";
       root.whiteSpace = "pre-wrap";
     }
+    if (props.variant === "nowrap") {
+      // Single line, fixed height: clip overflow with an ellipsis rather than
+      // wrapping onto new lines (which would grow the container's height). The
+      // full value stays available via the adjacent copy button.
+      root.whiteSpace = "nowrap";
+      root.overflow = "hidden";
+      root.textOverflow = "ellipsis";
+    }
     return { root };
   },
 });