diff --git a/_includes/layouts/base.njk b/_includes/layouts/base.njk
index bbd906e..4647db2 100644
--- a/_includes/layouts/base.njk
+++ b/_includes/layouts/base.njk
@@ -270,7 +270,10 @@
   </header>
 
   <main class="container py-8" data-pagefind-body>
-    {% if withSidebar and not (homepageConfig and homepageConfig.sections) %}
+    {% if withSidebar and page.url == "/" and homepageConfig and homepageConfig.sections %}
+    {# Homepage: builder controls its own layout and sidebar #}
+    {{ content | safe }}
+    {% elif withSidebar %}
     <div class="layout-with-sidebar">
       <div class="main-content">
         {{ content | safe }}
@@ -279,9 +282,6 @@
         {% include "components/sidebar.njk" %}
       </aside>
     </div>
-    {% elif withSidebar and homepageConfig and homepageConfig.sections %}
-    {# Homepage builder controls its own layout and sidebar #}
-    {{ content | safe }}
     {% elif withBlogSidebar %}
     <div class="layout-with-sidebar">
       <div class="main-content">