diff --git a/public/src/forum/search.js b/public/src/forum/search.js
index c21baec1e6..4d53321ec8 100644
--- a/public/src/forum/search.js
+++ b/public/src/forum/search.js
@@ -2,13 +2,16 @@
 
 	$(document).ready(function() {
 		var searchQuery = $('#topics-container').attr('data-search-query');
-		
+
 		$('.search-result-text').each(function() {
 			var text = $(this).html();
 			var regex = new RegExp(searchQuery, 'gi');
 			text = text.replace(regex, '<span class="label label-success">'+searchQuery+'</span>');
 			$(this).html(text);
 		});
+
+
+		$('#search-form input').val(searchQuery);
 	});
 
 })();
\ No newline at end of file
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 71d6fe93d8..3ff41760ed 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -64,7 +64,7 @@
 				<form id="search-form" class="navbar-form navbar-right hidden-xs" role="search" method="GET" action="">
 					<div class="hide" id="search-fields">
 				    	<div class="form-group">
-							<input type="text" class="form-control" placeholder="Search" name="query">
+							<input type="text" class="form-control" placeholder="Search" name="query" value="">
 				    	</div>
 				    	<button type="submit" class="btn btn-default hide">Search</button>
 				    </div>