diff --git a/js/components/main.js b/js/components/main.js
index d981baf76c5..544de271a40 100644
--- a/js/components/main.js
+++ b/js/components/main.js
@@ -908,6 +908,7 @@ class Main extends ImmutableComponent {
                 enableNoScript={this.enableNoScript(activeSiteSettings)}
                 settings={this.props.appState.get('settings')}
                 noScriptIsVisible={noScriptIsVisible}
+                menubarVisible={customTitlebar.menubarVisible}
               />
               <div className='topLevelEndButtons'>
                 <div className={cx({
diff --git a/js/components/navigationBar.js b/js/components/navigationBar.js
index aa01a26479b..4e0d109bf3f 100644
--- a/js/components/navigationBar.js
+++ b/js/components/navigationBar.js
@@ -150,6 +150,7 @@ class NavigationBar extends ImmutableComponent {
         endLoadTime={this.props.endLoadTime}
         titleMode={this.titleMode}
         urlbar={this.props.navbar.get('urlbar')}
+        menubarVisible={this.props.menubarVisible}
         />
       {
         isSourceAboutUrl(this.props.location)
diff --git a/js/components/urlBar.js b/js/components/urlBar.js
index a8289f1bf4a..c3e70658510 100644
--- a/js/components/urlBar.js
+++ b/js/components/urlBar.js
@@ -453,7 +453,8 @@ class UrlBar extends ImmutableComponent {
             urlLocation={this.props.urlbar.get('location')}
             urlPreview={this.props.urlbar.get('urlPreview')}
             searchSelectEntry={this.searchSelectEntry}
-            previewActiveIndex={this.props.previewActiveIndex || 0} />
+            previewActiveIndex={this.props.previewActiveIndex || 0}
+            menubarVisible={this.props.menubarVisible} />
           : null
         }
     </form>
diff --git a/js/components/urlBarSuggestions.js b/js/components/urlBarSuggestions.js
index 1ffdaefbb7c..0278aa26b75 100644
--- a/js/components/urlBarSuggestions.js
+++ b/js/components/urlBarSuggestions.js
@@ -156,8 +156,9 @@ class UrlBarSuggestions extends ImmutableComponent {
     addToItems(searchSuggestions, 'searchTitle', locale.translation('searchSuggestionTitle'), 'fa-search')
     addToItems(topSiteSuggestions, 'topSiteTitle', locale.translation('topSiteSuggestionTitle'), 'fa-link')
     const documentHeight = Number.parseInt(window.getComputedStyle(document.querySelector(':root')).getPropertyValue('--navbar-height'), 10)
+    const menuHeight = this.props.menubarVisible ? 30 : 0
     return <ul className='urlBarSuggestions' style={{
-      maxHeight: document.documentElement.offsetHeight - documentHeight - 2
+      maxHeight: document.documentElement.offsetHeight - documentHeight - 2 - menuHeight
     }}>
       {items}
     </ul>
diff --git a/less/navigationBar.less b/less/navigationBar.less
index 87e9c3e16cf..e80b8d90793 100644
--- a/less/navigationBar.less
+++ b/less/navigationBar.less
@@ -41,11 +41,6 @@
     box-sizing: border-box;
   }
 
-  .navbarMenubarFlexContainer {
-    padding-left: 5px;
-    padding-top: 5px;
-  }
-
   #urlInput { width: 100%; }
 
   // changes to ensure window can be as small as 480px wide