diff --git a/frontend/playwright/ui/visual-specs/workspace.spec.js b/frontend/playwright/ui/visual-specs/workspace.spec.js
index 48e715b175..763fc4cfb1 100644
--- a/frontend/playwright/ui/visual-specs/workspace.spec.js
+++ b/frontend/playwright/ui/visual-specs/workspace.spec.js
@@ -374,6 +374,16 @@ test.describe("Component options", () => {
       "annotation-saved.png",
       { maxDiffPixelRatio: 0, threshold: 0 },
     );
+
+    // Collapsed by clicking its title.
+    await title.click();
+    await expect(
+      workspace.rightSidebar.getByText("An annotation"),
+    ).toBeHidden();
+    await expect(workspace.rightSidebar).toHaveScreenshot(
+      "annotation-collapsed.png",
+      { maxDiffPixelRatio: 0, threshold: 0 },
+    );
   });
 });
 
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
index 00660a3dfb..9f30b24036 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
@@ -175,9 +175,7 @@
                                   :editing editing?
                                   :creating creating?)}
        [:div {:class (stl/css-case :annotation-title true
-                                   :expandeable (not (or editing? creating?))
-                                   :expanded expanded?)
-              :on-click on-toggle-expand}
+                                   :expanded expanded?)}
 
         (if (or editing? creating?)
           [:span {:class (stl/css :annotation-title-name)}
@@ -185,7 +183,12 @@
              (tr "workspace.options.component.edit-annotation")
              (tr "workspace.options.component.create-annotation"))]
 
-          [:*
+          ;; Only the arrow and the name toggle: the actions next to them
+          ;; are buttons too, and a button cannot hold other buttons.
+          [:button {:type "button"
+                    :class (stl/css :annotation-title-toggle)
+                    :aria-expanded (boolean expanded?)
+                    :on-click on-toggle-expand}
            [:> icon* {:icon-id (if expanded? i/arrow-down i/arrow-right)
                       :class (stl/css :annotation-title-icon-arrow)
                       :size "s"}]
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss
index acbe025003..77403735b7 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss
@@ -73,10 +73,6 @@
     border-bottom: $b-1 solid var(--color-background-quaternary);
   }
 
-  &.expandeable {
-    cursor: pointer;
-  }
-
   &:hover {
     .annotation-title-icon-action {
       display: flex;
@@ -84,6 +80,22 @@
   }
 }
 
+// Takes the whole free width of the title, so the clickable area stays
+// as it was when the whole title toggled.
+.annotation-title-toggle {
+  display: flex;
+  flex-grow: 1;
+  align-items: center;
+  align-self: stretch;
+  padding: 0;
+  border: none;
+  background: none;
+  color: inherit;
+  font: inherit;
+  text-align: start;
+  cursor: pointer;
+}
+
 .annotation-title-name {
   flex-grow: 1;
 }
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
index f8dcee251d..53b53d711c 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
@@ -1037,7 +1037,14 @@
 
     [:div {:class (stl/css :grid-tracks) :data-testid testid}
      [:div {:class (stl/css :grid-track-header)}
-      [:button {:class (stl/css :expand-icon) :on-click toggle}
+      ;; The track title next to it toggles too, as a larger pointer
+      ;; target; this button is the one for the keyboard.
+      [:button {:class (stl/css :expand-icon)
+                :aria-label (if is-column
+                              (tr "workspace.layout-grid.editor.columns")
+                              (tr "workspace.layout-grid.editor.rows"))
+                :aria-expanded (boolean expanded?)
+                :on-click toggle}
        [:> icon* {:icon-id i/menu :class (stl/css :expand-icon-svg)}]]
       [:div {:class (stl/css :track-title) :on-click toggle}
        [:div {:class (stl/css :track-name) :title track-name} track-name]
diff --git a/frontend/translations/en.po b/frontend/translations/en.po
index fe90880cc5..e971e9decc 100644
--- a/frontend/translations/en.po
+++ b/frontend/translations/en.po
@@ -6747,6 +6747,14 @@ msgstr "Full screen"
 msgid "workspace.header.zoom-selected"
 msgstr "Zoom to selected"
 
+#: src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
+msgid "workspace.layout-grid.editor.columns"
+msgstr "Columns"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
+msgid "workspace.layout-grid.editor.rows"
+msgstr "Rows"
+
 #: src/app/main/ui/workspace/sidebar/options/menus/grid_cell.cljs:294, src/app/main/ui/workspace/sidebar/options/menus/grid_cell.cljs:296, src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs:854
 msgid "workspace.layout-grid.editor.options.edit-grid"
 msgstr "Edit grid"
diff --git a/frontend/translations/es.po b/frontend/translations/es.po
index 2d2b8109bd..65ab208de5 100644
--- a/frontend/translations/es.po
+++ b/frontend/translations/es.po
@@ -6831,6 +6831,14 @@ msgstr "Pantalla completa"
 msgid "workspace.header.zoom-selected"
 msgstr "Zoom a selección"
 
+#: src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
+msgid "workspace.layout-grid.editor.columns"
+msgstr "Columnas"
+
+#: src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
+msgid "workspace.layout-grid.editor.rows"
+msgstr "Filas"
+
 #: src/app/main/ui/workspace/sidebar/options/menus/grid_cell.cljs:294, src/app/main/ui/workspace/sidebar/options/menus/grid_cell.cljs:296, src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs:854
 msgid "workspace.layout-grid.editor.options.edit-grid"
 msgstr "Editar grid"