diff --git a/pages/_includes/parts/demo-layout.html b/pages/_includes/parts/demo-layout.html
index 4e5edc474..2741baf7b 100644
--- a/pages/_includes/parts/demo-layout.html
+++ b/pages/_includes/parts/demo-layout.html
@@ -13,7 +13,7 @@
 			{% endif %}
 		</div>
 		{% if config.sidebar-right %}
-		<div class="col-3 {% if config.sidebar-dark %}bg-dark{% else %}border-left bg-white{% endif %}"></div>
+		<div class="{% if config.sidebar-narrow %}col-auto w-2{% else %}col-3{% endif %} {% if config.sidebar-dark %}bg-dark{% else %}border-left bg-white{% endif %}"></div>
 		{% endif %}
 	</div>
 </div>
diff --git a/scss/layout/_layout.scss b/scss/layout/_layout.scss
index 59c082ab1..815f91622 100644
--- a/scss/layout/_layout.scss
+++ b/scss/layout/_layout.scss
@@ -468,4 +468,16 @@ Folded sidebar
       left: $sidenav-width-narrow;
     }
   }
+
+  &.sidebar-right {
+    + .content {
+      margin-left: 0;
+      margin-right: $sidenav-width-narrow;
+
+      .topnav {
+        left: 0;
+        right: $sidenav-width-narrow;
+      }
+    }
+  }
 }