diff --git a/app/views/dialog/playlists/_playlist.html.erb b/app/views/dialog/playlists/_playlist.html.erb
index 39c6f05a..e70f06c7 100644
--- a/app/views/dialog/playlists/_playlist.html.erb
+++ b/app/views/dialog/playlists/_playlist.html.erb
@@ -1,3 +1,4 @@
-<%= button_to playlist_songs_path(playlist, song_id: params[:song_id]), method: :post, class: 'c-list__item u-cursor-pointer', form: { 'data-turbo-frame': 'turbo-playlist', 'data-test-id': 'dialog_playlist' } do %>
+<button type="submit" class='c-list__item u-cursor-pointer'
+        formaction="<%= playlist_songs_path(playlist) %>" data-test-id="dialog_playlist">
   <%= playlist.name %>
-<% end %>
+</button>
diff --git a/app/views/dialog/playlists/index.html.erb b/app/views/dialog/playlists/index.html.erb
index d46b9261..67feadce 100644
--- a/app/views/dialog/playlists/index.html.erb
+++ b/app/views/dialog/playlists/index.html.erb
@@ -3,16 +3,21 @@
 <% end %>
 
 <% if @playlists.present? %>
-  <div data-controller='infinite-scroll' data-infinite-scroll-container-value='#js-dialog-content' data-infinite-scroll-url-value='<%= dialog_playlists_path %>' data-infinite-scroll-total-pages-value='<%= @pagy.pages %>'>
-    <div id='turbo-dialog-playlists' data-action='click->dialog#hide' class='c-list'>
-      <%= render partial: 'dialog/playlists/playlist', collection: @playlists, cached: true %>
+  <%= form_tag nil, 'data-turbo-frame': 'turbo-playlist' do %>
+    <%= hidden_field_tag :song_id, params[:song_id] %>
+    <div data-controller='infinite-scroll' data-infinite-scroll-container-value='#js-dialog-content'
+        data-infinite-scroll-url-value='<%= dialog_playlists_path %>'
+        data-infinite-scroll-total-pages-value='<%= @pagy.pages %>'>
+      <div id='turbo-dialog-playlists' data-action='click->dialog#hide' class='c-list'>
+        <%= render partial: 'dialog/playlists/playlist', collection: @playlists, cached: true %>
+      </div>
+      <div data-infinite-scroll-target='trigger' class='o-flex o-flex--justify-center u-my-small'>
+        <% if @pagy.next %>
+          <%= loader_tag %>
+        <% end %>
+      </div>
     </div>
-    <div data-infinite-scroll-target='trigger' class='o-flex o-flex--justify-center u-my-small'>
-      <% if @pagy.next %>
-        <%= loader_tag %>
-      <% end %>
-    </div>
-  </div>
+  <% end %>
 <% else %>
   <%= empty_alert_tag %>
 <% end %>