diff --git a/lib/default-theme/styles/mobile.styl b/lib/default-theme/styles/mobile.styl
index 089f75b297..16e81f2872 100644
--- a/lib/default-theme/styles/mobile.styl
+++ b/lib/default-theme/styles/mobile.styl
@@ -21,9 +21,13 @@ $mobileSidebarWidth = $sidebarWidth * 0.82
     transition transform .2s ease
   .page
     padding-left 0
-  .theme-container.sidebar-open
-    .sidebar
-      transform translateX(0)
+  .theme-container
+    &.sidebar-open
+      .sidebar
+        transform translateX(0)
+    &.no-navbar
+      .sidebar
+        padding-top: 0
 
 // narrow mobile
 @media (max-width: $MQMobileNarrow)
diff --git a/lib/default-theme/styles/theme.styl b/lib/default-theme/styles/theme.styl
index 1b6c2b9328..e515037310 100644
--- a/lib/default-theme/styles/theme.styl
+++ b/lib/default-theme/styles/theme.styl
@@ -167,10 +167,14 @@ th, td
     .sidebar-mask
       display: block
   &.no-navbar
-    .content:not(.custom)
+    .content:not(.custom) >
       h1, h2, h3, h4, h5, h6
         margin-top 1.5rem
         padding-top 0
+    .sidebar
+      top 0
+    .custom-layout
+      padding-top 0
 
 
 @media (min-width: ($MQMobile + 1px))