diff --git a/assets/js/search.js b/assets/js/search.js
index 1ebd39e..10a5cdc 100644
--- a/assets/js/search.js
+++ b/assets/js/search.js
@@ -46,27 +46,25 @@
     }
 
     results.classList.add("has-hits");
-    
+
     if (showParent) {
       searchHits = groupBy(searchHits, hit => hit.parent);
     }
 
     const items = [];
 
-    if (showParent) {
-      for (const section in searchHits) {
-        const item = document.createElement('li'),
-              title = item.appendChild(document.createElement('span')),
-              subList = item.appendChild(document.createElement('ul'));
+    for (const section in searchHits) {
+      const item = document.createElement('li');
 
+      if (showParent) {
+        const title = item.appendChild(document.createElement('span'));
         title.textContent = section;
-        title.classList.add('gdoc-search__list__section-title');
-        createLinks(searchHits[section], subList);
-
-        items.push(item);
       }
-    } else {
-      items.push(...createLinks(searchHits));
+
+      const subList = item.appendChild(document.createElement('ul'));
+      createLinks(searchHits[section], subList);
+
+      items.push(item);
     }
 
     items.forEach(item => {
@@ -84,11 +82,15 @@
     const items = [];
 
     for (const page of pages) {
-      const item = document.createElement('li'),
-            a = item.appendChild(document.createElement('a'));
+      const item = document.createElement("li"),
+            entry = item.appendChild(document.createElement("span")),
+            a = entry.appendChild(document.createElement("a"));
+
+      entry.classList.add("flex")
 
       a.href = page.href;
       a.textContent = page.title;
+      a.classList.add("gdoc-search__entry")
 
       if (target) {
         target.appendChild(item);
diff --git a/src/sass/_base.scss b/src/sass/_base.scss
index 51f15b9..82417e1 100644
--- a/src/sass/_base.scss
+++ b/src/sass/_base.scss
@@ -203,21 +203,6 @@ img {
     }
   }
 
-  &__entry {
-    flex: 1;
-    color: $body-font-color;
-
-    &:hover,
-    &.is-active {
-      text-decoration: underline;
-      text-decoration-style: dashed !important;
-    }
-
-    &:visited {
-      color: $body-font-color;
-    }
-  }
-
   &--main > ul > li > span,
   &--main > ul > li > span > a,
   &--main > ul > li > label,
@@ -230,6 +215,22 @@ img {
   }
 }
 
+.gdoc-nav__entry,
+.gdoc-search__entry {
+  flex: 1;
+  color: $body-font-color;
+
+  &:hover,
+  &.is-active {
+    text-decoration: underline;
+    text-decoration-style: dashed !important;
+  }
+
+  &:visited {
+    color: $body-font-color;
+  }
+}
+
 .gdoc-page {
   min-width: $body-min-width;
   flex-grow: 1;
@@ -438,9 +439,9 @@ img {
 
   &__list {
     display: none;
-    background-color: #ffffff;
+    background: $white;
     border-radius: $border-radius;
-    box-shadow: 0 1px 3px 0 rgba(0,0,0,0.1),0 1px 2px 0 rgba(0,0,0,0.06);
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
     position: absolute;
     margin: 0;
     padding: $padding-8;
@@ -461,22 +462,17 @@ img {
     }
 
     > li > span {
-      color: $gray-600;
-      font-size: $font-size-14;
       font-weight: bold;
+      color: $gray-600;
     }
 
     > li + li {
-      margin-top: $padding-16;
+      margin-top: $padding-8;
     }
 
     .icon {
       margin-right: $padding-4;
     }
-
-    a {
-      font-size: $font-size-16;
-    }
   }
 
   &:focus-within &__list.has-hits {