diff --git a/app/views/boards/columns/_empty_placeholder.html.erb b/app/views/boards/columns/_empty_placeholder.html.erb
index 51a5b79e6..d9da8a896 100644
--- a/app/views/boards/columns/_empty_placeholder.html.erb
+++ b/app/views/boards/columns/_empty_placeholder.html.erb
@@ -1,6 +1,4 @@
-<div class="cards__list hide-scrollbar" data-drag-drop-item-container>
-  <div class="blank-slate blank-slate--drag card card--hide-unless-empty">
-    <p>Drag cards here</p>
-  </div>
-  <div class="blank-slate blank-slate--empty card--hide-unless-empty">No cards here</div>
+<div class="blank-slate blank-slate--drag card card--hide-unless-empty">
+  <p>Drag cards here</p>
 </div>
+<div class="blank-slate blank-slate--empty card--hide-unless-empty">No cards here</div>
diff --git a/app/views/boards/columns/_list.html.erb b/app/views/boards/columns/_list.html.erb
deleted file mode 100644
index 3c7ed5068..000000000
--- a/app/views/boards/columns/_list.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="cards__list hide-scrollbar" data-drag-drop-item-container>
-  <%= yield %>
-  <%= render "cards/display/previews", cards: cards, draggable: draggable %>
-</div>
diff --git a/app/views/boards/columns/closeds/show.html.erb b/app/views/boards/columns/closeds/show.html.erb
index 8a9d1f56c..110db1c8c 100644
--- a/app/views/boards/columns/closeds/show.html.erb
+++ b/app/views/boards/columns/closeds/show.html.erb
@@ -12,12 +12,14 @@
 
 <section class="cards cards--grid">
   <%= turbo_frame_tag :closed_column do %>
-    <% if @page.used? %>
-      <%= with_automatic_pagination :closed_column, @page do %>
-        <%= render "boards/columns/list", cards: @page.records, draggable: true %>
+    <div class="cards__list hide-scrollbar" data-drag-drop-item-container>
+      <% if @page.used? %>
+        <%= with_automatic_pagination :closed_column, @page do %>
+          <%= render "cards/display/previews", cards: @page.records, draggable: true %>
+        <% end %>
+      <% else %>
+        <%= render "boards/columns/empty_placeholder" %>
       <% end %>
-    <% else %>
-      <%= render "boards/columns/empty_placeholder" %>
-    <% end %>
+    </div>
   <% end %>
 </section>
diff --git a/app/views/boards/columns/not_nows/show.html.erb b/app/views/boards/columns/not_nows/show.html.erb
index 88ea33868..f744635ae 100644
--- a/app/views/boards/columns/not_nows/show.html.erb
+++ b/app/views/boards/columns/not_nows/show.html.erb
@@ -12,12 +12,14 @@
 
 <section class="cards cards--grid">
   <%= turbo_frame_tag :not_now_column do %>
-    <% if @page.used? %>
-      <%= with_automatic_pagination :not_now_column, @page do %>
-        <%= render "boards/columns/list", cards: @page.records, draggable: true %>
+    <div class="cards__list hide-scrollbar" data-drag-drop-item-container>
+      <% if @page.used? %>
+        <%= with_automatic_pagination :not_now_column, @page do %>
+          <%= render "cards/display/previews", cards: @page.records, draggable: true %>
+        <% end %>
+      <% else %>
+        <%= render "boards/columns/empty_placeholder" %>
       <% end %>
-    <% else %>
-      <%= render "boards/columns/empty_placeholder" %>
-    <% end %>
+    </div>
   <% end %>
 </section>
diff --git a/app/views/boards/columns/show.html.erb b/app/views/boards/columns/show.html.erb
index 4fef4eec7..cd6c396e7 100644
--- a/app/views/boards/columns/show.html.erb
+++ b/app/views/boards/columns/show.html.erb
@@ -12,12 +12,14 @@
 
 <section class="cards cards--grid">
   <%= turbo_frame_tag @column, :cards do %>
-    <% if @page.used? %>
-      <%= with_automatic_pagination dom_id(@column, :cards), @page do %>
-        <%= render "boards/columns/list", cards: @page.records, draggable: true %>
+    <div class="cards__list hide-scrollbar" data-drag-drop-item-container>
+      <% if @page.used? %>
+        <%= with_automatic_pagination dom_id(@column, :cards), @page do %>
+          <%= render "cards/display/previews", cards: @page.records, draggable: true %>
+        <% end %>
+      <% else %>
+        <%= render "boards/columns/empty_placeholder" %>
       <% end %>
-    <% else %>
-      <%= render "boards/columns/empty_placeholder" %>
-    <% end %>
+    </div>
   <% end %>
 </section>
diff --git a/app/views/boards/columns/streams/show.html.erb b/app/views/boards/columns/streams/show.html.erb
index 9f0477b39..6ec6ac339 100644
--- a/app/views/boards/columns/streams/show.html.erb
+++ b/app/views/boards/columns/streams/show.html.erb
@@ -12,12 +12,14 @@
 
 <section class="cards cards--grid">
   <%= turbo_frame_tag :stream_column do %>
-    <% if @page.used? %>
-      <%= with_automatic_pagination :stream_column, @page do %>
-        <%= render "boards/columns/list", cards: @page.records, draggable: true %>
+    <div class="cards__list hide-scrollbar" data-drag-drop-item-container>
+      <% if @page.used? %>
+        <%= with_automatic_pagination :stream_column, @page do %>
+          <%= render "cards/display/previews", cards: @page.records, draggable: true %>
+        <% end %>
+      <% else %>
+        <%= render "boards/columns/empty_placeholder" %>
       <% end %>
-    <% else %>
-      <%= render "boards/columns/empty_placeholder" %>
-    <% end %>
+    </div>
   <% end %>
 </section>
diff --git a/app/views/boards/show/_maybe.html.erb b/app/views/boards/show/_maybe.html.erb
index 552cef52c..54f151af9 100644
--- a/app/views/boards/show/_maybe.html.erb
+++ b/app/views/boards/show/_maybe.html.erb
@@ -7,14 +7,14 @@
     <%= render "boards/show/expander", title: "Maybe?", count: board.cards.awaiting_triage.count, column_id: "maybe" %>
     <%= render "boards/show/menu/maximize", column_path: board_columns_stream_path(board) %>
   </header>
-  <% if page.used? %>
-    <%= with_automatic_pagination "maybe", @page do %>
-      <%= render "boards/columns/list", cards: page.records, draggable: true do %>
-        <%= render "columns/show/add_card_button", board: board %>
+  <div class="cards__list">
+    <%= render "columns/show/add_card_button", board: board %>
+  </div>
+  <div class="cards__list hide-scrollbar" data-drag-drop-item-container>
+    <% if page.used? %>
+      <%= with_automatic_pagination "maybe", @page do %>
+        <%= render "cards/display/previews", cards: page.records, draggable: true %>
       <% end %>
     <% end %>
-  <% else %>
-    <div class="cards__list hide-scrollbar" data-drag-drop-item-container>
-    </div>
-  <% end %>
+  </div>
 <% end %>
diff --git a/app/views/public/boards/columns/_list.html.erb b/app/views/public/boards/columns/_list.html.erb
deleted file mode 100644
index b12af2185..000000000
--- a/app/views/public/boards/columns/_list.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="cards__list hide-scrollbar">
-  <%= render "cards/display/public_previews", cards: cards %>
-</div>
diff --git a/app/views/public/boards/columns/closeds/show.html.erb b/app/views/public/boards/columns/closeds/show.html.erb
index 0986b06fc..21977743e 100644
--- a/app/views/public/boards/columns/closeds/show.html.erb
+++ b/app/views/public/boards/columns/closeds/show.html.erb
@@ -12,13 +12,15 @@
 
 <section class="cards cards--grid">
   <%= turbo_frame_tag :closed_column do %>
-    <% if @page.used? %>
-      <%= with_automatic_pagination :closed_column, @page do %>
-        <%= render "public/boards/columns/list", cards: @page.records %>
+    <div class="cards__list hide-scrollbar">
+      <% if @page.used? %>
+        <%= with_automatic_pagination :closed_column, @page do %>
+          <%= render "cards/display/public_previews", cards: @page.records %>
+        <% end %>
+      <% else %>
+        <div class="blank-slate blank-slate--empty">No cards here</div>
       <% end %>
-    <% else %>
-      <div class="blank-slate blank-slate--empty">No cards here</div>
-    <% end %>
+    </div>
   <% end %>
 </section>
 
diff --git a/app/views/public/boards/columns/not_nows/show.html.erb b/app/views/public/boards/columns/not_nows/show.html.erb
index c92c6bce4..786cb7afb 100644
--- a/app/views/public/boards/columns/not_nows/show.html.erb
+++ b/app/views/public/boards/columns/not_nows/show.html.erb
@@ -12,13 +12,15 @@
 
 <section class="cards cards--grid">
   <%= turbo_frame_tag :not_now_column do %>
-    <% if @page.used? %>
-      <%= with_automatic_pagination :not_now_column, @page do %>
-        <%= render "public/boards/columns/list", cards: @page.records %>
+    <div class="cards__list hide-scrollbar">
+      <% if @page.used? %>
+        <%= with_automatic_pagination :not_now_column, @page do %>
+          <%= render "cards/display/public_previews", cards: @page.records %>
+        <% end %>
+      <% else %>
+        <div class="blank-slate blank-slate--empty">No cards here</div>
       <% end %>
-    <% else %>
-      <div class="blank-slate blank-slate--empty">No cards here</div>
-    <% end %>
+    </div>
   <% end %>
 </section>
 
diff --git a/app/views/public/boards/columns/show.html.erb b/app/views/public/boards/columns/show.html.erb
index 68d3b168d..6f0d2542f 100644
--- a/app/views/public/boards/columns/show.html.erb
+++ b/app/views/public/boards/columns/show.html.erb
@@ -12,13 +12,15 @@
 
 <section class="cards cards--grid">
   <%= turbo_frame_tag @column, :cards do %>
-    <% if @page.used? %>
-      <%= with_automatic_pagination dom_id(@column, :cards), @page do %>
-        <%= render "public/boards/columns/list", cards: @page.records %>
+    <div class="cards__list hide-scrollbar">
+      <% if @page.used? %>
+        <%= with_automatic_pagination dom_id(@column, :cards), @page do %>
+          <%= render "cards/display/public_previews", cards: @page.records %>
+        <% end %>
+      <% else %>
+        <div class="blank-slate blank-slate--empty">No cards here</div>
       <% end %>
-    <% else %>
-      <div class="blank-slate blank-slate--empty">No cards here</div>
-    <% end %>
+    </div>
   <% end %>
 </section>
 
diff --git a/app/views/public/boards/columns/streams/show.html.erb b/app/views/public/boards/columns/streams/show.html.erb
index 77902570a..4df8c2b12 100644
--- a/app/views/public/boards/columns/streams/show.html.erb
+++ b/app/views/public/boards/columns/streams/show.html.erb
@@ -12,13 +12,15 @@
 
 <section class="cards cards--grid">
   <%= turbo_frame_tag :stream_column do %>
-    <% if @page.used? %>
-      <%= with_automatic_pagination :stream_column, @page do %>
-        <%= render "public/boards/columns/list", cards: @page.records %>
+    <div class="cards__list hide-scrollbar">
+      <% if @page.used? %>
+        <%= with_automatic_pagination :stream_column, @page do %>
+          <%= render "cards/display/public_previews", cards: @page.records %>
+        <% end %>
+      <% else %>
+        <div class="blank-slate blank-slate--empty">No cards here</div>
       <% end %>
-    <% else %>
-      <div class="blank-slate blank-slate--empty">No cards here</div>
-    <% end %>
+    </div>
   <% end %>
 </section>