diff --git a/public/css/style.less b/public/css/style.less
index fbae92c847..37160aa97b 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -787,14 +787,6 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
 }
 
 // go into header
-.navbar {
-	.form-search {
-		float: left;
-		margin-top: 8px;
-		margin-bottom: 5px;
-	}
-
-}
 
 .search-result-post {
   width: 100%;
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 03dcd5863c..69e89eba67 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -62,7 +62,8 @@
 				</ul>
 
 
-				<ul id="right-menu" class="nav navbar-nav pull-right">
+
+				<ul id="right-menu" class="nav navbar-nav navbar-right">
 					<li class="notifications dropdown text-center">
 						<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="notif_dropdown"><i class="icon-circle-blank"></i></a>
 						<ul id="notif-list" class="dropdown-menu" aria-labelledby="notif_dropdown">
@@ -70,10 +71,12 @@
 						</ul>
 					</li>
 					<li>
-						<form id="search-form" class="form-search form-inline visible-md visible-lg" action="" method="GET">
-							<input type="text" name="query" class="form-control search-query" />
-							<button type="submit" class="btn hide">Search</button>
-						</form>
+						<form id="search-form" class="navbar-form navbar-right" role="search" method="GET" action="">
+					      <div class="form-group">
+					        <input type="text" class="form-control" placeholder="Search" name="query">
+					      </div>
+					      <button type="submit" class="btn btn-default hide">Search</button>
+					    </form>
 					</li>
 				</ul>
 				<div id="pagination"></div>