3 files changed, 18 insertions, 6 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 2d35ff83a5..4929e14ef7 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -519,6 +519,14 @@ function parse_document(container)
 				return;
 			}
 
+			// Unhide the quick-links menu if it has content
+			if (persist) {
+				item.addClass('hidden');
+				if (menu.find('li:not(.separator, .clone)').length || (responsive && menu.find('li.clone').length)) {
+					item.removeClass('hidden');
+				}
+			}
+
 			// Reset responsive and compact layout
 			if (responsive) {
 				responsive = false;
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
index bafb106282..4cd306f87b 100644
--- a/phpBB/styles/prosilver/template/navbar_header.html
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -3,7 +3,7 @@
 
 	<ul id="nav-main" class="linklist bulletin" role="menubar">
 
-		<li id="quick-links" class="small-icon responsive-menu dropdown-container" data-skip-responsive="true">
+		<li id="quick-links" class="small-icon responsive-menu dropdown-container<!-- IF not S_DISPLAY_QUICK_LINKS and not S_DISPLAY_SEARCH --> hidden<!-- ENDIF -->" data-skip-responsive="true">
 			<a href="#" class="responsive-menu-link dropdown-trigger">{L_QUICK_LINKS}</a>
 			<div class="dropdown hidden">
 				<div class="pointer"><div class="pointer-inner"></div></div>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index c94bd7d017..ecad522ef5 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -327,14 +327,13 @@ ul.linklist:after {
 }
 
 ul.linklist > li {
-	display: block;
-	list-style-type: none;
 	float: left;
-	width: auto;
-	margin-right: 7px;
 	font-size: 1.1em;
 	line-height: 2.2em;
+	list-style-type: none;
+	margin-right: 7px;
 	padding-top: 1px;
+	width: auto;
 }
 
 ul.linklist > li.rightside, p.rightside, a.rightside {
@@ -404,12 +403,13 @@ li.responsive-menu.dropdown-left .dropdown {
 	right: -6px;
 }
 
-ul.linklist .dropdown-down .dropdown {
+ul.linklist .dropdown {
 	top: 22px;
 }
 
 ul.linklist .dropdown-up .dropdown {
 	bottom: 18px;
+	top: auto;
 }
 
 /* Bulletin icons for list items
@@ -1152,6 +1152,10 @@ form > p.post-notice strong {
 	width: 340px;
 }
 
+.nojs .dropdown-extended .dropdown-contents {
+	position: relative;
+}
+
 .dropdown-extended .header {
 	padding: 0 10px;
 	font-family: Arial, "Helvetica Neue", Helvetica, Arial, sans-serif;