diff --git a/app/components/avo/index/resource_controls_component.html.erb b/app/components/avo/index/resource_controls_component.html.erb
index 4de64b35f..b27575501 100644
--- a/app/components/avo/index/resource_controls_component.html.erb
+++ b/app/components/avo/index/resource_controls_component.html.erb
@@ -1,4 +1,4 @@
-<%= content_tag :div, class: "space-x-2 flex flex-row justify-between ml-2 has-record-selector:ml-0" do %>
+<%= content_tag :div, class: "#{view_type == "grid" ? "flex-wrap" : "space-x-2"} flex flex-row justify-evenly ml-2 has-record-selector:ml-0" do %>
   <% @resource.render_row_controls(item: singular_resource_name).each do |control| %>
     <%= render_control control %>
   <% end %>
diff --git a/app/components/avo/index/resource_controls_component.rb b/app/components/avo/index/resource_controls_component.rb
index 8c8a2ad8f..e903cb118 100644
--- a/app/components/avo/index/resource_controls_component.rb
+++ b/app/components/avo/index/resource_controls_component.rb
@@ -172,4 +172,8 @@ def hidden_params
 
     hidden.compact
   end
+
+  def view_type
+    params[:view_type]
+  end
 end