diff --git a/templates/search.tpl b/templates/search.tpl
index 0afb0d3..bcb5e6d 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -135,7 +135,9 @@
 			<!-- IF matchCount -->
 			<div class="alert alert-info">[[search:results_matching, {matchCount}, {search_query}, {time}]] </div>
 			<!-- ELSE -->
+			<!-- IF search_query -->
 			<div class="alert alert-warning">[[search:no-matches]]</div>
+			<!-- ENDIF search_query -->
 			<!-- ENDIF matchCount -->
 
 			<!-- BEGIN posts -->