diff --git a/ext/home/theme.php b/ext/home/theme.php
index 7d279d5c..574e7eb4 100644
--- a/ext/home/theme.php
+++ b/ext/home/theme.php
@@ -39,6 +39,7 @@ EOD
 			<div class='space' id='search'>
 				<form action='".search_link()."' method='GET'>
 				<input name='search' size='30' type='search' value='' class='autocomplete_tags' autofocus='autofocus' />
+				<input type='hidden' name='q' value='post/list'>
 				<input type='submit' value='Search'/>
 				</form>
 			</div>
diff --git a/ext/index/theme.php b/ext/index/theme.php
index 35460378..94761dda 100644
--- a/ext/index/theme.php
+++ b/ext/index/theme.php
@@ -91,6 +91,7 @@ and of course start organising your images :-)
         $h_search = "
 			<p><form action='$h_search_link' method='GET'>
 				<input type='search' name='search' value='$h_search_string' placeholder='Search' class='autocomplete_tags' />
+				<input type='hidden' name='q' value='post/list'>
 				<input type='submit' value='Find' style='display: none;' />
 			</form>
 		";
diff --git a/ext/random_list/theme.php b/ext/random_list/theme.php
index 5cc19d81..a16eeae4 100644
--- a/ext/random_list/theme.php
+++ b/ext/random_list/theme.php
@@ -53,6 +53,7 @@ class RandomListTheme extends Themelet
         $h_search = "
 			<p><form action='$h_search_link' method='GET'>
 				<input type='search' name='search' value='$h_search_string' placeholder='Search random list' class='autocomplete_tags' />
+				<input type='hidden' name='q' value='random'>
 				<input type='submit' value='Find' style='display: none;' />
 			</form>
 		";
diff --git a/ext/view/theme.php b/ext/view/theme.php
index c375b6e0..800ef830 100644
--- a/ext/view/theme.php
+++ b/ext/view/theme.php
@@ -98,7 +98,8 @@ class ViewPostTheme extends Themelet
     {
         $h_pin = $this->build_pin($image);
         $h_search = "
-			<p><form action='".search_link()."' method='POST'>
+			<p><form action='".search_link()."' method='GET'>
+				<input type='hidden' name='q' value='post/list'>
 				<input type='search' name='search' placeholder='Search' class='autocomplete_tags'>
 				<input type='submit' value='Find' style='display: none;'>
 			</form>
diff --git a/themes/danbooru/index.theme.php b/themes/danbooru/index.theme.php
index 9afcacf2..8bbe2317 100644
--- a/themes/danbooru/index.theme.php
+++ b/themes/danbooru/index.theme.php
@@ -51,6 +51,7 @@ class CustomIndexTheme extends IndexTheme
         return "
 			<p><form action='$h_search_link' method='GET'>
 				<input name='search' type='text' value='$h_search_string' class='autocomplete_tags' placeholder='Search' />
+				<input type='hidden' name='q' value='post/list'>
 				<input type='submit' value='Find' style='display: none;' />
 			</form>
 			<div id='search_completions'></div>";
diff --git a/themes/danbooru2/index.theme.php b/themes/danbooru2/index.theme.php
index 4f5b1067..52993984 100644
--- a/themes/danbooru2/index.theme.php
+++ b/themes/danbooru2/index.theme.php
@@ -36,6 +36,7 @@ class CustomIndexTheme extends IndexTheme
 			<p><form action='$h_search_link' method='GET'>
 				<input name='search' type='text' value='$h_search_string' class='autocomplete_tags' placeholder=''  style='width:75%'/>
 				<input type='submit' value='Go' style='width:20%'>
+				<input type='hidden' name='q' value='post/list'>
 			</form>
 			<div id='search_completions'></div>";
     }
diff --git a/themes/danbooru2/view.theme.php b/themes/danbooru2/view.theme.php
index bd737a90..8e97ba5e 100644
--- a/themes/danbooru2/view.theme.php
+++ b/themes/danbooru2/view.theme.php
@@ -74,6 +74,7 @@ class CustomViewPostTheme extends ViewPostTheme
 			<form action='".search_link()."' method='POST'>
 				<input name='search' type='text'  style='width:75%'>
 				<input type='submit' value='Go' style='width:20%'>
+				<input type='hidden' name='q' value='post/list'>
 			</form>
 		";