From 589ae1ab36846b73170122002042ff4b86660932 Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Mon, 12 Jan 2026 16:23:20 -0600
Subject: [PATCH] Move handleDesktop inside restoreColumnsDisablingTransitions

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

diff --git a/app/javascript/controllers/collapsible_columns_controller.js b/app/javascript/controllers/collapsible_columns_controller.js
index 1a9ba4174..e432a054f 100644
--- a/app/javascript/controllers/collapsible_columns_controller.js
+++ b/app/javascript/controllers/collapsible_columns_controller.js
@@ -14,13 +14,12 @@ export default class extends Controller {
   }
 
   async connect() {
-    await this.#restoreColumnsDisablingTransitions()
-    this.#setupIntersectionObserver()
-
     this.mediaQuery = window.matchMedia(this.desktopBreakpointValue)
     this.handleDesktop = this.#handleDesktop.bind(this)
     this.mediaQuery.addEventListener("change", this.handleDesktop)
-    this.handleDesktop(this.mediaQuery)
+
+    await this.#restoreColumnsDisablingTransitions()
+    this.#setupIntersectionObserver()
   }
 
   disconnect() {
@@ -57,6 +56,7 @@ export default class extends Controller {
   async #restoreColumnsDisablingTransitions() {
     this.#disableTransitions()
     this.#restoreColumns()
+    this.#handleDesktop()
 
     await nextFrame()
     this.#enableTransitions()