diff --git a/less/search.less b/less/search.less
index 0f26e1b..7f9a02c 100644
--- a/less/search.less
+++ b/less/search.less
@@ -33,23 +33,39 @@
 	}
 }
 
-.quick-search-results {
-	max-width: 400px;
-	max-height: 500px;
-	overflow-x: hidden;
-	overflow-y: auto;
-	a {
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		overflow: hidden
-	}
-	.quick-search-title {
-		font-weight: 600;
-	}
+.quick-search-container {
+	.dropdown-menu;
+	display: block;
+	left: auto;
+	right: 0px;
+	.quick-search-results {
+		max-width: 400px;
+		max-height: 500px;
+		overflow-x: hidden;
+		overflow-y: auto;
+		padding: 0px 0px;
+		li {
+			list-style: none;
+			a {
+				text-overflow: ellipsis;
+				overflow: hidden;
+				display: block;
+				padding: 3px 20px;
+				clear: both;
+				font-weight: 400;
+				line-height: 1.42857143;
+				white-space: nowrap;
+				color: @gray-dark;
+			}
+		}
+		.quick-search-title {
+			font-weight: 600;
+		}
 
-	.snippet {
-		word-break: break-word;
-		white-space: normal;
+		.snippet {
+			word-break: break-word;
+			white-space: normal;
+		}
 	}
 }
 
diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl
index ae31b86..6d613d5 100644
--- a/templates/partials/menu.tpl
+++ b/templates/partials/menu.tpl
@@ -173,7 +173,7 @@
 								<button type="submit" class="btn btn-default hide">[[global:search]]</button>
 							</div>
 						</form>
-						<ul id="quick-search-results" class="dropdown-menu quick-search-results hidden"></ul>
+						<div id="quick-search-container" class="quick-search-container hidden"></div>
 					</li>
 					<li class="visible-xs" id="search-menu">
 						<a href="{relative_path}/search">
diff --git a/templates/partials/quick-search-results.tpl b/templates/partials/quick-search-results.tpl
index 2c92bee..f0ddf06 100644
--- a/templates/partials/quick-search-results.tpl
+++ b/templates/partials/quick-search-results.tpl
@@ -1,3 +1,4 @@
+<ul id="quick-search-results" class="quick-search-results">
 {{{each posts}}}
 <li>
 	<a href="{config.relative_path}/post/{posts.pid}">
@@ -17,10 +18,14 @@
 <li role="separator" class="divider"></li>
 <!-- ENDIF -->
 {{{end}}}
+</ul>
 <!-- IF multiplePages -->
-<li class="text-center">
+<div class="text-center">
 	<a href="{url}">
 		[[search:see-more-results, {matchCount}]]
 	</a>
-</li>
-<!-- ENDIF multiplePages -->
\ No newline at end of file
+</div>
+<!-- ENDIF multiplePages -->
+{{{if !posts.length}}}
+<div class="text-center no-results">[[search:no-matches]]</li>
+{{{end}}}
\ No newline at end of file