diff --git a/public/css/style.less b/public/css/style.less
index 10d22efd58..9868acb94c 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -827,7 +827,7 @@ body .navbar .nodebb-inline-block {
 .form-search {
 	float: left;
 	margin-top: 5px;
-	margin-bottom:0px;
+	margin-bottom: 5px;
 }
 
 .search-result-post {
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 72184968e7..cd95b71d80 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -62,11 +62,12 @@
 								<li><a href="#"><i class="icon-refresh icon-spin"></i> Loading Notifications</a></li>
 							</ul>
 						</li>
-						<form id="search-form"
-						class="form-search form-inline" action="" method="GET">
-							<input type="text" name="query" class="input-medium search-query">
-							<button type="submit" class="btn hide">Search</button>
-						</form>
+						<li>
+							<form id="search-form" class="form-search form-inline" action="" method="GET">
+								<input type="text" name="query" class="input-medium search-query">
+								<button type="submit" class="btn hide">Search</button>
+							</form>
+						</li>
 						
 					</ul>
 				</div>