diff --git a/app/views/bar/_bar.html.erb b/app/views/bar/_bar.html.erb
index 078078dd9..fb747a04e 100644
--- a/app/views/bar/_bar.html.erb
+++ b/app/views/bar/_bar.html.erb
@@ -1,18 +1,8 @@
-<%= tag.div \
-      class: "bar full-width",
-      data: {
-        controller: "bar",
-        bar_dialog_outlet: "#bar-modal",
-        bar_search_url_value: search_path
-      } do %>
+<div class="bar full-width" data-controller="bar" data-bar-dialog-outlet="#bar-model"
+    data-bar-search-url-value="<%= search_path %>">
   <div class="flex justify-center bar__placeholder" data-bar-target="buttonsContainer">
-    <%= tag.button \
-          class: "btn btn--plain",
-          data: {
-            controller: "hotkey",
-            action: "
-            bar#search
-            keydown.k@document->hotkey#click" } do %>
+    <%= tag.button class: "btn btn--plain",
+          data: { controller: "hotkey", action: "bar#search keydown.k@document->hotkey#click" } do %>
       <span>Search <% if platform.desktop? -%><kbd>K</kbd><% end %></span>
     <% end %>
   </div>
@@ -21,13 +11,8 @@
     <%= render "searches/form", query_terms: "" %>
   </div>
 
-  <%= tag.dialog \
-    id: "bar-modal",
-    class: "bar__modal",
-    data: {
-      controller: "dialog",
-      dialog_target: "dialog",
-      action: "keydown.esc@document->bar#reset:stop" } do %>
+  <%= tag.dialog id: "bar-modal", class: "bar__modal",
+        data: { controller: "dialog", dialog_target: "dialog", action: "keydown.esc@document->bar#reset:stop" } do %>
     <%= turbo_frame_tag "bar_content", data: { bar_target: "turboFrame" } %>
   <% end %>
-<% end %>
+</div>