diff --git a/docs/default-theme-config/README.md b/docs/default-theme-config/README.md
index c54c072f2989448d1016ec7a29600d3895253e77..d3e1c41e2401981f21267031c1051d5656a91b68 100644
--- a/docs/default-theme-config/README.md
+++ b/docs/default-theme-config/README.md
@@ -20,6 +20,8 @@ $codeBgColor = #282c34
 
 ### nav
 
+### search
+
 ### sidebar
 
 ### sidebarDepth
diff --git a/lib/default-theme/NavLinks.vue b/lib/default-theme/NavLinks.vue
index 368c34c8aeaccc44de691c503c4ac9cf07af934a..e107975d88808bb2322e1df403ce178277d2a404 100644
--- a/lib/default-theme/NavLinks.vue
+++ b/lib/default-theme/NavLinks.vue
@@ -1,5 +1,5 @@
 <template>
-  <nav class="nav-links" v-if="userLinks.length && githubLink">
+  <nav class="nav-links" v-if="userLinks.length || githubLink">
     <!-- user links -->
     <router-link v-for="item in userLinks"
       :to="item.link"
diff --git a/lib/default-theme/Navbar.vue b/lib/default-theme/Navbar.vue
index b7bbd91e49c5b38bda979e66acaed0dd977e0c7e..30697ea62afdb023b0cad96de54a33ccf4c1342f 100644
--- a/lib/default-theme/Navbar.vue
+++ b/lib/default-theme/Navbar.vue
@@ -12,7 +12,7 @@
       </span>
     </router-link>
     <div class="links">
-      <SearchBox/>
+      <SearchBox v-if="$site.themeConfig.search !== false"/>
       <NavLinks class="can-hide"/>
     </div>
   </header>
diff --git a/lib/default-theme/Sidebar.vue b/lib/default-theme/Sidebar.vue
index e65a30fd80b3d7cb8132b9e9c7aca842573aa9b0..ad01d8ad32160b3ba4282473e5c30fbff6fca36a 100644
--- a/lib/default-theme/Sidebar.vue
+++ b/lib/default-theme/Sidebar.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="sidebar">
     <NavLinks/>
-    <ul>
+    <ul class="sidebar-links" v-if="sidebarItems.length">
       <li v-for="(item, i) in sidebarItems">
         <SidebarLink v-if="item.type === 'page'" :item="item"/>
         <SidebarGroup v-else-if="item.type === 'group'"
@@ -149,12 +149,13 @@ function resolveItem (item, pages, base, isNested) {
     display none
     border-bottom 1px solid $borderColor
     padding 0.5rem 0 0.75rem 0
-    margin-bottom 1rem
     a
       display block
       font-weight 600
       font-size 1.1em
       padding 0.5rem 0 0.5rem 1.5rem
+  .sidebar-links
+    margin-top 1rem
 
 @media (max-width: $MQMobile)
   .sidebar