diff --git a/app/components/blacklight/search_navbar_component.html.erb b/app/components/blacklight/search_navbar_component.html.erb
index 7e9bb5dd8..0b7f4309c 100644
--- a/app/components/blacklight/search_navbar_component.html.erb
+++ b/app/components/blacklight/search_navbar_component.html.erb
@@ -1,5 +1,5 @@
 <%= tag.div class: 'navbar-search navbar navbar-light bg-light', role: 'navigation', aria: { label: t('blacklight.search.header') } do %>
-  <div class="<%= container_classes %>-xxl">
+  <div class="<%= container_classes %>-fluid">
     <%= search_bar %>
   </div>
 <% end %>
diff --git a/app/components/blacklight/top_navbar_component.html.erb b/app/components/blacklight/top_navbar_component.html.erb
index 606fc693d..e555b4225 100644
--- a/app/components/blacklight/top_navbar_component.html.erb
+++ b/app/components/blacklight/top_navbar_component.html.erb
@@ -1,5 +1,5 @@
 <nav class="navbar navbar-expand-md topbar" role="navigation">
-  <div class="<%= container_classes %>-xxl">
+  <div class="<%= container_classes %>-fluid">
     <%= logo_link %>
     <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-bs-toggle="collapse" data-target="#user-util-collapse" data-bs-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
diff --git a/app/views/layouts/blacklight/base.html.erb b/app/views/layouts/blacklight/base.html.erb
index 1f3fcdc08..e54c8b6fe 100644
--- a/app/views/layouts/blacklight/base.html.erb
+++ b/app/views/layouts/blacklight/base.html.erb
@@ -43,7 +43,7 @@
     </nav>
     <%= render partial: 'shared/header_navbar' %>
 
-    <main id="main-container" class="<%= container_classes %>-xxl" role="main" aria-label="<%= t('blacklight.main.aria.main_container') %>">
+    <main id="main-container" class="<%= container_classes %>-fluid" role="main" aria-label="<%= t('blacklight.main.aria.main_container') %>">
       <%= content_for(:container_header) %>
 
       <%= render partial: 'shared/flash_msg', layout: 'shared/flash_messages' %>
diff --git a/app/views/layouts/catalog_result.html.erb b/app/views/layouts/catalog_result.html.erb
index 3bb175230..cab1bde5a 100644
--- a/app/views/layouts/catalog_result.html.erb
+++ b/app/views/layouts/catalog_result.html.erb
@@ -1,8 +1,10 @@
+
 <% content_for(:content) do %>
   <section>
-    <%= content_for(:sidebar) %>
-    <%= yield %>
+    <div class="container-xxl">
+      <%= content_for(:sidebar) %>
+      <%= yield %>
+    </div>
   </section>
 <% end %>
-
 <%= render template: "layouts/blacklight/base" %>