diff --git a/src/components/__tests__/GenerationComposer.test.tsx b/src/components/__tests__/GenerationComposer.test.tsx
index ce2edb0b..3fcb9463 100644
--- a/src/components/__tests__/GenerationComposer.test.tsx
+++ b/src/components/__tests__/GenerationComposer.test.tsx
@@ -332,6 +332,30 @@ describe("GenerationComposer", () => {
     expect(screen.getByDisplayValue("visible prompt")).toBeInTheDocument();
   });
 
+  it("opens model selection from the collapsed model label without expanding", () => {
+    useWorkflowStore.setState({ nodes: [imageNode("img-1", true, { inputPrompt: "visible prompt" })] });
+    render(<GenerationComposer />);
+
+    fireEvent.click(screen.getByLabelText("Collapse composer"));
+    fireEvent.click(screen.getByLabelText("Select model"));
+
+    expect(screen.getByTestId("model-dialog")).toHaveAttribute("data-filter", "image");
+    expect(screen.queryByDisplayValue("visible prompt")).not.toBeInTheDocument();
+  });
+
+  it("submits from the collapsed generate button without expanding", async () => {
+    useWorkflowStore.setState({ nodes: [imageNode("img-1", true, { inputPrompt: "visible prompt" })] });
+    render(<GenerationComposer />);
+
+    fireEvent.click(screen.getByLabelText("Collapse composer"));
+    fireEvent.click(screen.getByLabelText("Generate"));
+
+    await waitFor(() => {
+      expect(useWorkflowStore.getState().regenerateNode).toHaveBeenCalledWith("img-1");
+    });
+    expect(screen.queryByDisplayValue("visible prompt")).not.toBeInTheDocument();
+  });
+
   it("uses the video model filter and reruns the selected video node", async () => {
     useWorkflowStore.setState({ nodes: [videoNode("vid-1", true)] });
     render(<GenerationComposer />);
diff --git a/src/components/composer/GenerationComposer.tsx b/src/components/composer/GenerationComposer.tsx
index f8f054f4..2cf192c8 100644
--- a/src/components/composer/GenerationComposer.tsx
+++ b/src/components/composer/GenerationComposer.tsx
@@ -985,31 +985,50 @@ export function GenerationComposer() {
           />
           {isComposerCollapsed ? (
             <div className="flex h-16 cursor-pointer items-center gap-3 px-4" onClick={handleCollapsedComposerClick}>
-              <button
-                type="button"
-                onClick={expandComposer}
-                title={t("composer.expand")}
-                className="min-w-0 flex-1 rounded-lg text-left focus:outline-none focus-visible:ring-2 focus-visible:ring-cyan-400/50"
-              >
+              <div className="min-w-0 flex-1">
                 <span className="flex min-w-0 items-center gap-2">
-                  <span className="shrink-0 text-[11px] text-neutral-500">{modeLabel}</span>
+                  <button
+                    type="button"
+                    onClick={expandComposer}
+                    title={t("composer.expand")}
+                    className="shrink-0 rounded text-left text-[11px] text-neutral-500 focus:outline-none focus-visible:ring-2 focus-visible:ring-cyan-400/50"
+                  >
+                    {modeLabel}
+                  </button>
                   <span className="h-3 w-px shrink-0 bg-neutral-700" />
                   {isProcessNode ? (
-                    <span className="truncate text-sm text-neutral-300">{collapsedStatus}</span>
+                    <button
+                      type="button"
+                      onClick={expandComposer}
+                      title={t("composer.expand")}
+                      className="min-w-0 truncate rounded text-left text-sm text-neutral-300 focus:outline-none focus-visible:ring-2 focus-visible:ring-cyan-400/50"
+                    >
+                      {collapsedStatus}
+                    </button>
                   ) : (
-                    <span
-                      className={`min-w-0 truncate text-sm ${canChooseModel ? "text-neutral-100" : "text-neutral-500"}`}
+                    <button
+                      type="button"
+                      onClick={() => canChooseModel && setModelDialogOpen(true)}
+                      disabled={!canChooseModel}
+                      aria-label={t("composer.selectModel")}
+                      className="min-w-0 truncate rounded-md text-left text-sm text-neutral-100 transition-colors hover:text-cyan-200 disabled:text-neutral-500"
+                      title={t("composer.selectModelTitle", { model: getComposerModelLabel(draft.selectedModel) })}
                     >
                       {getComposerModelLabel(draft.selectedModel)}
-                    </span>
+                    </button>
                   )}
                 </span>
                 {!isProcessNode && (
-                  <span className="mt-1 block truncate text-xs text-neutral-500">
+                  <button
+                    type="button"
+                    onClick={expandComposer}
+                    title={t("composer.expand")}
+                    className="mt-1 block max-w-full truncate rounded text-left text-xs text-neutral-500 focus:outline-none focus-visible:ring-2 focus-visible:ring-cyan-400/50"
+                  >
                     {collapsedStatus}
-                  </span>
+                  </button>
                 )}
-              </button>
+              </div>
 
               <button
                 type="button"