diff --git a/templates/index.html b/templates/index.html
index be52baf5..1a35747a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -71,16 +71,14 @@
 			<a id="index-feature-top" href="{{ config.root }}{% if mod %}{{ config.file_mod }}?/{% endif %}{{ board.dir }}{{ config.dir.featured }}">[{% trans %}Featured{% endtrans %}]</a>
 		{% endif %}
 		{% if config.board_search %}
-		<!-- Start Search Form -->
-		    	<form style="display:inline" action="/search.php">
-		            	<p style="margin: 10px;">
-		                		<input type="text" name="search" placeholder="{{ board.uri }} search">
-		                		<input type="hidden" name="board" value="{{ board.uri }}">
-		                		<input type="submit" value="Search">
-		            	</p>
-		    	</form>
-			<!-- End Search Form -->
+			{% if board.uri %}
+				 <form style="display:inline" action="/search.php">
+					<input type="text" name="search" placeholder="{{ board.uri }} search">
+					<input type="hidden" name="board" value="{{ board.uri }}">
+					<input type="submit" value="Search">
+				</form>
 			{% endif %}
+		{% endif %}
 	</span>
 	<hr />
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">