diff --git a/templates/content/app/components/editor/BubbleToolbar.test.tsx b/templates/content/app/components/editor/BubbleToolbar.test.tsx
index 08ee68c75d..80b2cec168 100644
--- a/templates/content/app/components/editor/BubbleToolbar.test.tsx
+++ b/templates/content/app/components/editor/BubbleToolbar.test.tsx
@@ -34,7 +34,43 @@ vi.mock("@/components/ui/tooltip", () => ({
   TooltipTrigger: ({ children }: { children: ReactNode }) => children,
 }));
 
-describe("BubbleToolbar link shortcut", () => {
+vi.mock("@/components/ui/popover", () => ({
+  Popover: ({ children }: { children: ReactNode }) => children,
+  PopoverTrigger: ({ children }: { children: ReactNode }) => children,
+  PopoverContent: ({
+    children,
+    onCloseAutoFocus,
+    onEscapeKeyDown,
+  }: {
+    children: ReactNode;
+    onCloseAutoFocus?: (event: Event) => void;
+    onEscapeKeyDown?: (event: KeyboardEvent) => void;
+  }) => (
+    <div>
+      <button
+        data-escape-key-down
+        onClick={() => {
+          onEscapeKeyDown?.(new KeyboardEvent("keydown", { key: "Escape" }));
+        }}
+      />
+      <button
+        data-close-auto-focus
+        onClick={(clickEvent) => {
+          const closeEvent = new Event("closeAutoFocus", {
+            cancelable: true,
+          });
+          onCloseAutoFocus?.(closeEvent);
+          clickEvent.currentTarget.dataset.prevented = String(
+            closeEvent.defaultPrevented,
+          );
+        }}
+      />
+      {children}
+    </div>
+  ),
+}));
+
+describe("BubbleToolbar", () => {
   let editor: Editor | null = null;
   let root: Root | null = null;
   let editorElement: HTMLDivElement | null = null;
@@ -147,4 +183,247 @@ describe("BubbleToolbar link shortcut", () => {
       toolbarElement.querySelector('input[aria-label="editor.pasteLink"]'),
     ).not.toBeNull();
   });
+
+  it("shows the active text style and converts a heading to Text by keyboard", () => {
+    editorElement = document.createElement("div");
+    toolbarElement = document.createElement("div");
+    document.body.append(editorElement, toolbarElement);
+    editor = new Editor({
+      element: editorElement,
+      extensions: [StarterKit],
+      content: "<h2>Selected heading</h2>",
+    });
+    editor.commands.setTextSelection({ from: 1, to: 9 });
+
+    root = createRoot(toolbarElement);
+    act(() => root!.render(<BubbleToolbar editor={editor!} />));
+
+    const trigger = toolbarElement.querySelector<HTMLButtonElement>(
+      'button[aria-label="editor.slash.turnInto: editor.heading2"]',
+    );
+    expect(trigger?.textContent).toContain("H2");
+
+    const textOption = [
+      ...toolbarElement.querySelectorAll<HTMLButtonElement>(
+        'button[role="menuitemradio"]',
+      ),
+    ].find((button) => button.textContent?.includes("editor.slash.text"));
+    act(() => {
+      textOption!.dispatchEvent(
+        new MouseEvent("click", {
+          detail: 0,
+          bubbles: true,
+          cancelable: true,
+        }),
+      );
+    });
+
+    expect(editor.getHTML()).toContain("<p>Selected heading</p>");
+    expect(editor.getHTML()).not.toContain("<h2>Selected heading</h2>");
+  });
+
+  it("converts every block in a mixed paragraph and heading selection to Text", () => {
+    editorElement = document.createElement("div");
+    toolbarElement = document.createElement("div");
+    document.body.append(editorElement, toolbarElement);
+    editor = new Editor({
+      element: editorElement,
+      extensions: [StarterKit],
+      content: "<p>First block</p><h2>Second block</h2>",
+    });
+    editor.commands.setTextSelection({
+      from: 1,
+      to: editor.state.doc.content.size - 2,
+    });
+    root = createRoot(toolbarElement);
+    act(() => root!.render(<BubbleToolbar editor={editor!} />));
+
+    const textOption = [
+      ...toolbarElement.querySelectorAll<HTMLButtonElement>(
+        'button[role="menuitemradio"]',
+      ),
+    ].find((button) => button.textContent?.includes("editor.slash.text"));
+    act(() => textOption!.click());
+
+    expect(editor.getHTML()).toContain("<p>First block</p><p>Second block</p>");
+    expect(editor.getHTML()).not.toContain("<h2>");
+  });
+
+  it("allows close autofocus to restore focus when no style was applied", () => {
+    editorElement = document.createElement("div");
+    toolbarElement = document.createElement("div");
+    document.body.append(editorElement, toolbarElement);
+    editor = new Editor({
+      element: editorElement,
+      extensions: [StarterKit],
+      content: "<p>Selected paragraph</p>",
+    });
+    editor.commands.setTextSelection({ from: 1, to: 9 });
+
+    root = createRoot(toolbarElement);
+    act(() => root!.render(<BubbleToolbar editor={editor!} />));
+
+    const closeAutoFocus = toolbarElement.querySelector<HTMLButtonElement>(
+      "button[data-close-auto-focus]",
+    )!;
+    act(() => closeAutoFocus.click());
+
+    expect(closeAutoFocus.dataset.prevented).toBe("false");
+  });
+
+  it("returns focus to the editor when Escape closes the text-style menu", async () => {
+    editorElement = document.createElement("div");
+    toolbarElement = document.createElement("div");
+    document.body.append(editorElement, toolbarElement);
+    editor = new Editor({
+      element: editorElement,
+      extensions: [StarterKit],
+      content: "<p>Selected paragraph</p>",
+    });
+    editor.commands.setTextSelection({ from: 1, to: 9 });
+
+    root = createRoot(toolbarElement);
+    act(() => root!.render(<BubbleToolbar editor={editor!} />));
+    const trigger = toolbarElement.querySelector<HTMLButtonElement>(
+      'button[aria-label="editor.slash.turnInto: editor.slash.text"]',
+    )!;
+    trigger.focus();
+
+    const escapeKeyDown = toolbarElement.querySelector<HTMLButtonElement>(
+      "button[data-escape-key-down]",
+    )!;
+    const closeAutoFocus = toolbarElement.querySelector<HTMLButtonElement>(
+      "button[data-close-auto-focus]",
+    )!;
+    await act(async () => {
+      escapeKeyDown.click();
+      closeAutoFocus.click();
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    });
+
+    expect(closeAutoFocus.dataset.prevented).toBe("true");
+    expect(editor.isFocused).toBe(true);
+    expect(document.activeElement).toBe(editor.view.dom);
+  });
+
+  it.each([5, 6] as const)(
+    "identifies an H%s block and converts it to Text",
+    (level) => {
+      editorElement = document.createElement("div");
+      toolbarElement = document.createElement("div");
+      document.body.append(editorElement, toolbarElement);
+      editor = new Editor({
+        element: editorElement,
+        extensions: [StarterKit],
+        content: `<h${level}>Selected heading</h${level}>`,
+      });
+      editor.commands.setTextSelection({ from: 1, to: 9 });
+
+      root = createRoot(toolbarElement);
+      act(() => root!.render(<BubbleToolbar editor={editor!} />));
+
+      const trigger = toolbarElement.querySelector<HTMLButtonElement>(
+        `button[aria-label="editor.slash.turnInto: editor.heading${level}"]`,
+      );
+      expect(trigger?.textContent).toContain(`H${level}`);
+
+      const textOption = [
+        ...toolbarElement.querySelectorAll<HTMLButtonElement>(
+          'button[role="menuitemradio"]',
+        ),
+      ].find((button) => button.textContent?.includes("editor.slash.text"));
+      act(() => textOption!.click());
+
+      expect(editor.getHTML()).toContain("<p>Selected heading</p>");
+      expect(editor.getHTML()).not.toContain(
+        `<h${level}>Selected heading</h${level}>`,
+      );
+    },
+  );
+
+  it("updates the selector when the active block becomes an H5", () => {
+    editorElement = document.createElement("div");
+    toolbarElement = document.createElement("div");
+    document.body.append(editorElement, toolbarElement);
+    editor = new Editor({
+      element: editorElement,
+      extensions: [StarterKit],
+      content: "<p>Selected heading</p>",
+    });
+    editor.commands.setTextSelection({ from: 1, to: 9 });
+
+    root = createRoot(toolbarElement);
+    act(() => root!.render(<BubbleToolbar editor={editor!} />));
+    act(() => editor!.commands.setHeading({ level: 5 }));
+
+    const trigger = toolbarElement.querySelector<HTMLButtonElement>(
+      'button[aria-label="editor.slash.turnInto: editor.heading5"]',
+    );
+    expect(trigger?.textContent).toContain("H5");
+  });
+
+  it("sets an exact heading level without toggling the current style off", () => {
+    editorElement = document.createElement("div");
+    toolbarElement = document.createElement("div");
+    document.body.append(editorElement, toolbarElement);
+    editor = new Editor({
+      element: editorElement,
+      extensions: [StarterKit],
+      content: "<h3>Stable heading</h3>",
+    });
+    editor.commands.setTextSelection({ from: 1, to: 7 });
+
+    root = createRoot(toolbarElement);
+    act(() => root!.render(<BubbleToolbar editor={editor!} />));
+
+    const headingOption = [
+      ...toolbarElement.querySelectorAll<HTMLButtonElement>(
+        'button[role="menuitemradio"]',
+      ),
+    ].find((button) => button.textContent?.includes("editor.heading3"));
+    expect(headingOption?.getAttribute("aria-checked")).toBe("true");
+    act(() => headingOption!.click());
+
+    expect(editor.getHTML()).toContain("<h3>Stable heading</h3>");
+    expect(editor.getHTML()).not.toContain("<p>Stable heading</p>");
+    const closeAutoFocus = toolbarElement.querySelector<HTMLButtonElement>(
+      "button[data-close-auto-focus]",
+    )!;
+    act(() => closeAutoFocus.click());
+    expect(closeAutoFocus.dataset.prevented).toBe("true");
+  });
+
+  it("sets a heading from a pointer click", () => {
+    editorElement = document.createElement("div");
+    toolbarElement = document.createElement("div");
+    document.body.append(editorElement, toolbarElement);
+    editor = new Editor({
+      element: editorElement,
+      extensions: [StarterKit],
+      content: "<p>Selected paragraph</p>",
+    });
+    editor.commands.setTextSelection({ from: 1, to: 9 });
+
+    root = createRoot(toolbarElement);
+    act(() => root!.render(<BubbleToolbar editor={editor!} />));
+
+    const headingOption = [
+      ...toolbarElement.querySelectorAll<HTMLButtonElement>(
+        'button[role="menuitemradio"]',
+      ),
+    ].find((button) => button.textContent?.includes("editor.heading3"));
+    editor.commands.blur();
+    act(() => {
+      headingOption!.dispatchEvent(
+        new PointerEvent("pointerdown", {
+          button: 0,
+          bubbles: true,
+          cancelable: true,
+        }),
+      );
+    });
+
+    expect(editor.getHTML()).toContain("<h3>Selected paragraph</h3>");
+    expect(editor.getHTML()).not.toContain("<p>Selected paragraph</p>");
+  });
 });
diff --git a/templates/content/app/components/editor/BubbleToolbar.tsx b/templates/content/app/components/editor/BubbleToolbar.tsx
index 2cccf27e0f..b7731d920f 100644
--- a/templates/content/app/components/editor/BubbleToolbar.tsx
+++ b/templates/content/app/components/editor/BubbleToolbar.tsx
@@ -1,15 +1,13 @@
 import { useT } from "@agent-native/core/client/i18n";
 import {
   IconBold,
+  IconCheck,
+  IconChevronDown,
   IconItalic,
   IconStrikethrough,
   IconCode,
   IconLink,
   IconMessageCircle,
-  IconH1,
-  IconH2,
-  IconH3,
-  IconH4,
 } from "@tabler/icons-react";
 import {
   NodeSelection,
@@ -20,8 +18,13 @@ import {
 import { Decoration, DecorationSet } from "@tiptap/pm/view";
 import type { Editor } from "@tiptap/react";
 import { BubbleMenu } from "@tiptap/react/menus";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
 import {
   Tooltip,
   TooltipContent,
@@ -56,6 +59,15 @@ type SelectionFillRange = {
   to: number;
 };
 
+type TextStyle = "paragraph" | 1 | 2 | 3 | 4 | 5 | 6;
+
+function activeTextStyle(editor: Editor): TextStyle {
+  for (const level of [1, 2, 3, 4, 5, 6] as const) {
+    if (editor.isActive("heading", { level })) return level;
+  }
+  return "paragraph";
+}
+
 const selectionFillPluginKey = new PluginKey<SelectionFillRange | null>(
   "contentSelectionFill",
 );
@@ -106,6 +118,86 @@ export function BubbleToolbar({ editor, onComment }: BubbleToolbarProps) {
   const t = useT();
   const [showLinkInput, setShowLinkInput] = useState(false);
   const [linkUrl, setLinkUrl] = useState("");
+  const [textStyleOpen, setTextStyleOpen] = useState(false);
+  const textStyleSelection = useRef<{ from: number; to: number } | null>(null);
+  const textStyleApplied = useRef(false);
+  const restoreEditorFocusOnClose = useRef(false);
+  const [textStyle, setTextStyle] = useState<TextStyle>(() =>
+    activeTextStyle(editor),
+  );
+
+  useEffect(() => {
+    const syncTextStyle = () => {
+      setTextStyle(activeTextStyle(editor));
+      const { from, to } = editor.state.selection;
+      if (from !== to) textStyleSelection.current = { from, to };
+    };
+    editor.on("selectionUpdate", syncTextStyle);
+    editor.on("transaction", syncTextStyle);
+    syncTextStyle();
+    return () => {
+      editor.off("selectionUpdate", syncTextStyle);
+      editor.off("transaction", syncTextStyle);
+    };
+  }, [editor]);
+
+  const textStyles = [
+    {
+      value: "paragraph" as const,
+      shortLabel: t("editor.slash.text"),
+      menuLabel: "T",
+      label: t("editor.slash.text"),
+    },
+    {
+      value: 1 as const,
+      shortLabel: "H1",
+      menuLabel: "H1",
+      label: t("editor.heading1"),
+    },
+    {
+      value: 2 as const,
+      shortLabel: "H2",
+      menuLabel: "H2",
+      label: t("editor.heading2"),
+    },
+    {
+      value: 3 as const,
+      shortLabel: "H3",
+      menuLabel: "H3",
+      label: t("editor.heading3"),
+    },
+    {
+      value: 4 as const,
+      shortLabel: "H4",
+      menuLabel: "H4",
+      label: t("editor.heading4"),
+    },
+  ];
+  const selectedTextStyle =
+    textStyles.find((style) => style.value === textStyle) ??
+    (typeof textStyle === "number"
+      ? {
+          value: textStyle,
+          shortLabel: `H${textStyle}`,
+          menuLabel: `H${textStyle}`,
+          label: textStyle === 5 ? t("editor.heading5") : t("editor.heading6"),
+        }
+      : textStyles[0]);
+
+  const applyTextStyle = (style: TextStyle) => {
+    const chain = editor.chain();
+    if (textStyleSelection.current) {
+      chain.setTextSelection(textStyleSelection.current);
+    }
+    if (style === "paragraph") {
+      chain.setParagraph().focus().run();
+    } else {
+      chain.setHeading({ level: style }).focus().run();
+    }
+    textStyleApplied.current = true;
+    setTextStyle(style);
+    setTextStyleOpen(false);
+  };
 
   const openLinkInput = useCallback(() => {
     setLinkUrl(editor.getAttributes("link").href || "");
@@ -251,30 +343,7 @@ export function BubbleToolbar({ editor, onComment }: BubbleToolbarProps) {
       isActive: () => editor.isActive("code"),
     },
     { type: "divider" as const },
-    {
-      icon: IconH1,
-      title: t("editor.heading1"),
-      action: () => editor.chain().focus().toggleHeading({ level: 1 }).run(),
-      isActive: () => editor.isActive("heading", { level: 1 }),
-    },
-    {
-      icon: IconH2,
-      title: t("editor.heading2"),
-      action: () => editor.chain().focus().toggleHeading({ level: 2 }).run(),
-      isActive: () => editor.isActive("heading", { level: 2 }),
-    },
-    {
-      icon: IconH3,
-      title: t("editor.heading3"),
-      action: () => editor.chain().focus().toggleHeading({ level: 3 }).run(),
-      isActive: () => editor.isActive("heading", { level: 3 }),
-    },
-    {
-      icon: IconH4,
-      title: t("editor.heading4"),
-      action: () => editor.chain().focus().toggleHeading({ level: 4 }).run(),
-      isActive: () => editor.isActive("heading", { level: 4 }),
-    },
+    { type: "text-style" as const },
     { type: "divider" as const },
     {
       icon: IconLink,
@@ -354,7 +423,7 @@ export function BubbleToolbar({ editor, onComment }: BubbleToolbarProps) {
         </div>
       ) : (
         <div
-          className="flex items-center gap-0.5 overflow-x-auto"
+          className="flex max-w-[calc(100vw-1rem)] items-center gap-0.5"
           onMouseDown={(e) => e.preventDefault()}
         >
           {items.map((item, i) => {
@@ -363,6 +432,103 @@ export function BubbleToolbar({ editor, onComment }: BubbleToolbarProps) {
                 <div key={`d-${i}`} className="w-px h-5 bg-border mx-0.5" />
               );
             }
+            if ("type" in item && item.type === "text-style") {
+              return (
+                <Popover
+                  key="text-style"
+                  open={textStyleOpen}
+                  onOpenChange={(open) => {
+                    if (open) {
+                      textStyleApplied.current = false;
+                      restoreEditorFocusOnClose.current = false;
+                      const { from, to } = editor.state.selection;
+                      if (from !== to)
+                        textStyleSelection.current = { from, to };
+                    }
+                    setTextStyleOpen(open);
+                  }}
+                >
+                  <PopoverTrigger asChild>
+                    <button
+                      type="button"
+                      aria-label={`${t("editor.slash.turnInto")}: ${selectedTextStyle.label}`}
+                      className="flex h-8 min-w-14 items-center justify-between gap-1 rounded px-2 text-sm font-medium text-popover-foreground/85 hover:bg-accent hover:text-accent-foreground"
+                    >
+                      <span>{selectedTextStyle.shortLabel}</span>
+                      <IconChevronDown size={14} strokeWidth={2} />
+                    </button>
+                  </PopoverTrigger>
+                  <PopoverContent
+                    portalled={false}
+                    align="start"
+                    sideOffset={24}
+                    className="w-44 p-1"
+                    onEscapeKeyDown={() => {
+                      restoreEditorFocusOnClose.current = true;
+                      window.setTimeout(() => editor.commands.focus(), 0);
+                    }}
+                    onCloseAutoFocus={(event) => {
+                      if (
+                        textStyleApplied.current ||
+                        restoreEditorFocusOnClose.current
+                      ) {
+                        event.preventDefault();
+                      }
+                      if (restoreEditorFocusOnClose.current) {
+                        editor.commands.focus();
+                      }
+                      textStyleApplied.current = false;
+                      restoreEditorFocusOnClose.current = false;
+                    }}
+                  >
+                    <div className="px-2 py-1 text-xs font-medium text-muted-foreground">
+                      {t("editor.slash.turnInto")}
+                    </div>
+                    <div
+                      role="menu"
+                      aria-label={t("editor.slash.turnInto")}
+                      className="flex flex-col gap-0.5"
+                    >
+                      {textStyles.map((style) => {
+                        const isSelected = style.value === textStyle;
+                        return (
+                          <button
+                            key={style.value}
+                            type="button"
+                            role="menuitemradio"
+                            aria-checked={isSelected}
+                            onPointerDown={(event) => {
+                              event.preventDefault();
+                              event.stopPropagation();
+                              applyTextStyle(style.value);
+                            }}
+                            onClick={(event) => {
+                              if (event.detail === 0) {
+                                applyTextStyle(style.value);
+                              }
+                            }}
+                            className={cn(
+                              "flex h-8 w-full items-center gap-2 rounded px-2 text-left text-sm",
+                              isSelected
+                                ? "bg-accent text-accent-foreground"
+                                : "text-popover-foreground hover:bg-accent hover:text-accent-foreground",
+                            )}
+                          >
+                            <span className="w-6 shrink-0 text-xs font-semibold text-muted-foreground">
+                              {style.menuLabel}
+                            </span>
+                            <span className="flex-1">{style.label}</span>
+                            {isSelected ? (
+                              <IconCheck size={15} strokeWidth={2.25} />
+                            ) : null}
+                          </button>
+                        );
+                      })}
+                    </div>
+                  </PopoverContent>
+                </Popover>
+              );
+            }
             const {
               icon: Icon,
               title,
diff --git a/templates/content/changelog/2026-08-03-choose-text-or-a-heading-from-one-compact-formatting-control.md b/templates/content/changelog/2026-08-03-choose-text-or-a-heading-from-one-compact-formatting-control.md
new file mode 100644
index 0000000000..9319af1709
--- /dev/null
+++ b/templates/content/changelog/2026-08-03-choose-text-or-a-heading-from-one-compact-formatting-control.md
@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-08-03
+---
+
+Choose Text or a heading from one compact formatting control.
diff --git a/templates/content/docs/solutions/evidence/content-text-selector/README.md b/templates/content/docs/solutions/evidence/content-text-selector/README.md
new file mode 100644
index 0000000000..a8f56b0a5c
--- /dev/null
+++ b/templates/content/docs/solutions/evidence/content-text-selector/README.md
@@ -0,0 +1,26 @@
+# Content text selector visual evidence
+
+Matched desktop captures for the compact Text/H1-H4 selector in the Content editor.
+
+## Before
+
+- Source revision: `dcc028cb7d67a0f9279f9235cdc4c16710ce5689`
+- Route: `http://127.0.0.1:3317/page/j4a5KAEDBHXY`
+- Viewport: `1496 x 846`, desktop Chrome
+- Fixture account: disposable local account `toolbar-demo@example.com`
+- Fixture page: `Toolbar comparison`
+- Fixture paragraph: `Select this sentence to compare the formatting toolbar.`
+- UI state: Personal workspace expanded, agent panel closed, full paragraph selected, formatting bubble open, text-style submenu closed
+
+![Before: separate H1-H4 toolbar buttons](./before.png)
+
+## After
+
+- Source: this pull request's production build
+- Route: `http://127.0.0.1:3317/page/vDisteHisXMq`
+- Viewport: `1496 x 846`, desktop Chrome
+- Fixture account, page title, paragraph, sidebar state, and agent-panel state match the before capture
+- UI state: full paragraph selected, formatting bubble open, Text selector expanded, Text checked, H1-H4 visible
+- The route differs because the isolated worktree uses its own disposable local fixture database; the rendered fixture and viewport are matched
+
+![After: compact Text selector with H1-H4 menu](./after.png)
diff --git a/templates/content/docs/solutions/evidence/content-text-selector/after.png b/templates/content/docs/solutions/evidence/content-text-selector/after.png
new file mode 100644
index 0000000000..f563cecf30
Binary files /dev/null and b/templates/content/docs/solutions/evidence/content-text-selector/after.png differ
diff --git a/templates/content/docs/solutions/evidence/content-text-selector/before.png b/templates/content/docs/solutions/evidence/content-text-selector/before.png
new file mode 100644
index 0000000000..74429c5835
Binary files /dev/null and b/templates/content/docs/solutions/evidence/content-text-selector/before.png differ