diff --git a/templates/search.tpl b/templates/search.tpl
index a7ddfe3..aedcc41 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -6,11 +6,11 @@
 			<form id="advanced-search">
 				<div class="form-group">
 					<div class="row">
-						<div class="col-md-6">
+						<div class="col-md-5">
 							<label>[[global:search]]</label>
 							<input type="text" class="form-control" id="search-input" placeholder="[[global:search]]">
 						</div>
-						<div class="col-md-6">
+						<div class="col-md-5">
 							<label>[[search:in]]</label>
 							<select id="search-in" class="form-control">
 								<option value="titlesposts">[[search:titles-posts]]</option>
@@ -20,14 +20,13 @@
 								<option value="tags">[[tags:tags]]</option>
 							</select>
 						</div>
+						<div class="col-md-2">
+							<label>&nbsp;</label>
+							<button type="submit" class="btn btn-default form-control">[[global:search]]</button>
+						</div>
 					</div>
 				</div>
 
-				<button type="submit" class="btn btn-default">[[global:search]]</button>
-
-				<br/>
-				<br/>
-
 				<div class="panel panel-default">
 					<div class="panel-heading" data-toggle="collapse" data-target=".search-options">
 						<h3 class="panel-title"><i class="fa fa-caret-down"></i> [[search:advanced-search]]</h3>