diff --git a/packages/app/src/composer/agent-controls/composer-control.tsx b/packages/app/src/composer/agent-controls/composer-control.tsx
index 83210b024f..80536846f8 100644
--- a/packages/app/src/composer/agent-controls/composer-control.tsx
+++ b/packages/app/src/composer/agent-controls/composer-control.tsx
@@ -144,7 +144,8 @@ function describeControl(
     selectedId: String(item.value ?? ""),
     value: choiceLabel,
     iconOnly,
-    tooltip: item.tooltip ?? (iconOnly ? `${item.title}: ${choiceLabel}` : item.title),
+    // An icon-only trigger names its value; a sheet row shows the value, so it names the action.
+    tooltip: iconOnly && !isSheet ? `${item.title}: ${choiceLabel}` : (item.tooltip ?? item.title),
     opensList: true,
   };
 }
diff --git a/packages/app/src/composer/agent-controls/control-items.tsx b/packages/app/src/composer/agent-controls/control-items.tsx
index a098c51071..29155deb72 100644
--- a/packages/app/src/composer/agent-controls/control-items.tsx
+++ b/packages/app/src/composer/agent-controls/control-items.tsx
@@ -55,7 +55,7 @@ function toFeatureItem(
   return {
     ...base,
     type: "select",
-    tooltip: iconOnly ? undefined : getControlTooltip(control),
+    tooltip: getControlTooltip(control),
     value: readSelectOption(control, options),
     choices: control.choices,
     iconOnly,