diff --git a/app/javascript/controllers/collapsible_columns_controller.js b/app/javascript/controllers/collapsible_columns_controller.js
index 3d9c8f412..2b6c24e71 100644
--- a/app/javascript/controllers/collapsible_columns_controller.js
+++ b/app/javascript/controllers/collapsible_columns_controller.js
@@ -122,8 +122,8 @@ export default class extends Controller {
     this._intersectionObserver = new IntersectionObserver(entries => {
       entries.forEach(entry => {
         const title = entry.target
-        const column = title.closest('[data-collapsible-columns-target="column"]')
-        
+        const column = title.closest(".cards")
+
         if (!column) return
 
         const offscreen = entry.intersectionRatio === 0
diff --git a/app/views/collections/show/_columns.html.erb b/app/views/collections/show/_columns.html.erb
index a52a308dd..79a1cf4ec 100644
--- a/app/views/collections/show/_columns.html.erb
+++ b/app/views/collections/show/_columns.html.erb
@@ -1,32 +1,28 @@
-<%= tag.div data: {
-      controller: "drag-and-drop drag-and-strum",
+<%= tag.div class: "card-columns", data: {
+      controller: "drag-and-drop drag-and-strum collapsible-columns",
       drag_and_drop_dragged_item_class: "drag-and-drop__dragged-item",
       drag_and_drop_hover_container_class: "drag-and-drop__hover-container",
+      collapsible_columns_collection_value: collection.id,
+      collapsible_columns_collapsed_class: "is-collapsed",
+      collapsible_columns_title_not_visible_class: "is-off-screen",
+      collapsible_columns_no_transitions_class: "no-transitions",
       action: "
         dragstart->drag-and-drop#dragStart
         dragover->drag-and-drop#dragOver
         dragenter->drag-and-strum#dragEnter
         drop->drag-and-drop#drop
         dragend->drag-and-drop#dragEnd" } do %>
-  <div
-    class="card-columns"
-    data-controller="collapsible-columns"
-    data-collapsible-columns-collection-value="<%= collection.id %>"
-    data-collapsible-columns-collapsed-class="is-collapsed"
-    data-collapsible-columns-title-not-visible-class="is-off-screen"
-    data-collapsible-columns-no-transitions-class="no-transitions">
-    <div class="card-columns__left">
-      <%= render "collections/show/not_now", collection: collection %>
-    </div>
+  <div class="card-columns__left">
+    <%= render "collections/show/not_now", collection: collection %>
+  </div>
 
-    <%= render "collections/show/stream", collection: collection, page: page %>
+  <%= render "collections/show/stream", collection: collection, page: page %>
 
-    <div class="card-columns__right">
-      <%= render partial: "collections/show/column", collection: collection.columns.sorted, cached: ->(column){ [ column, column.leftmost?, column.rightmost? ] } %>
-      <%= render "collections/show/closed", collection: collection %>
+  <div class="card-columns__right">
+    <%= render partial: "collections/show/column", collection: collection.columns.sorted, cached: ->(column){ [ column, column.leftmost?, column.rightmost? ] } %>
+    <%= render "collections/show/closed", collection: collection %>
 
-      <%= render "collections/show/menu/columns", collection: collection %>
-    </div>
+    <%= render "collections/show/menu/columns", collection: collection %>
   </div>
 <% end %>
 
diff --git a/app/views/public/collections/show/_stream.html.erb b/app/views/public/collections/show/_stream.html.erb
index 4fc065e78..94df5f07d 100644
--- a/app/views/public/collections/show/_stream.html.erb
+++ b/app/views/public/collections/show/_stream.html.erb
@@ -1,4 +1,4 @@
-<section id="the-stream" class="cards cards--considering"
+<section id="the-stream" class="cards cards--considering" data-column-name="Maybe?"
   data-action="turbo:before-morph-attribute->collapsible-columns#preventToggle">
   <header class="cards__expander">
     <h2 class="cards__expander-title position-relative" data-collapsible-columns-target="title">Maybe?</h2>