diff --git a/templates/search.tpl b/templates/search.tpl
index faf8226..19b5ce6 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -114,19 +114,25 @@
 
 						<div class="form-group post-search-item">
 							<label>[[search:show-results-as]]</label>
-							<div class="btn-group" data-toggle="buttons" id="show-results-as">
-								<label class="btn btn-primary active">
-									<input type="radio" name="options" id="show-as-posts" autocomplete="off" checked> [[global:posts]]
+							<div class="radio">
+								<label>
+									<input type="radio" name="options" id="show-as-posts" checked>
+									[[global:posts]]
 								</label>
-								<label class="btn btn-primary">
-									<input type="radio" name="options" id="show-as-topics" autocomplete="off"> [[global:topics]]
+							</div>
+							<div class="radio">
+								<label>
+									<input type="radio" name="options" id="show-as-topics">
+									[[global:topics]]
 								</label>
 							</div>
 						</div>
 
-
-						<a id="save-preferences" href="#">[[search:save-preferences]]</a>
-						<a id="clear-preferences" href="#">[[search:clear-preferences]]</a>
+						<div class="btn-group">
+							<button type="submit" class="btn btn-primary">[[global:search]]</button>
+							<a class="btn btn-default" id="save-preferences" href="#">[[search:save-preferences]]</a>
+							<a class="btn btn-default" id="clear-preferences" href="#">[[search:clear-preferences]]</a>
+						</div>
 					</div>
 				</div>
 			</form>