From d3bfd14c228ea13bdf046e21b4cce9bc15796e0e Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Fri, 2 Jan 2026 12:11:17 -0600
Subject: [PATCH] Only auto-focus Maybe column on desktop

---
 .../controllers/collapsible_columns_controller.js      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/javascript/controllers/collapsible_columns_controller.js b/app/javascript/controllers/collapsible_columns_controller.js
index 806e70c76..a2e337df2 100644
--- a/app/javascript/controllers/collapsible_columns_controller.js
+++ b/app/javascript/controllers/collapsible_columns_controller.js
@@ -48,7 +48,7 @@ export default class extends Controller {
   }
 
   focusOnColumn({ target }) {
-    if (this.#isCollapsed(target)) {
+    if (this.#isDesktop && this.#isCollapsed(target)) {
       this.#collapseAllExcept(target)
       this.#expand(target)
     }
@@ -97,7 +97,7 @@ export default class extends Controller {
   #collapse(column) {
     const key = this.#localStorageKeyFor(column)
 
-    this.#buttonFor(column).setAttribute("aria-expanded", "false")
+    this.#buttonFor(column)?.setAttribute("aria-expanded", "false")
     column.classList.remove(this.expandedClass)
     column.classList.add(this.collapsedClass)
     localStorage.removeItem(key)
@@ -106,7 +106,7 @@ export default class extends Controller {
   #expand(column) {
     const key = this.#localStorageKeyFor(column)
 
-    this.#buttonFor(column).setAttribute("aria-expanded", "true")
+    this.#buttonFor(column)?.setAttribute("aria-expanded", "true")
     column.classList.remove(this.collapsedClass)
     column.classList.add(this.expandedClass)
     localStorage.setItem(key, true)
@@ -170,8 +170,10 @@ export default class extends Controller {
   }
 
   #handleMobileMode() {
-    this.columnTargets.forEach(column => this.#collapse(column))
     this.#maybeButton.removeAttribute("disabled")
+    this.columnTargets.forEach(column => {
+      this.#collapse(column)
+    })
   }
 
   get #maybeButton() {