diff --git a/ext/index/theme.php b/ext/index/theme.php
index a971109f..3e4d3dcc 100644
--- a/ext/index/theme.php
+++ b/ext/index/theme.php
@@ -31,11 +31,12 @@ class IndexTheme extends Themelet {
 		$page->set_heading($page_title);
 		$page->add_block(new Block("Navigation", $nav, "left", 0));
 		if(count($images) > 0) {
-			$page->add_block(new Block("Images", $this->build_table($images, $query), "main", 10));
 			if($query) {
+				$page->add_block(new Block("Images", $this->build_table($images, "search=$query"), "main", 10));
 				$this->display_paginator($page, "post/list/$query", null, $this->page_number, $this->total_pages);
 			}
 			else {
+				$page->add_block(new Block("Images", $this->build_table($images, null), "main", 10));
 				$this->display_paginator($page, "post/list", null, $this->page_number, $this->total_pages);
 			}
 		}
diff --git a/themes/danbooru/index.theme.php b/themes/danbooru/index.theme.php
index a52750cf..32c13e3a 100644
--- a/themes/danbooru/index.theme.php
+++ b/themes/danbooru/index.theme.php
@@ -16,7 +16,7 @@ class IndexTheme extends Themelet {
 		}
 		else {
 			$search_string = implode(' ', $this->search_terms);
-			$query = "/".url_escape($search_string);
+			$query = url_escape($search_string);
 			$page_title = html_escape($search_string);
 		}
 
@@ -25,8 +25,14 @@ class IndexTheme extends Themelet {
 		$page->set_heading($page_title);
 		$page->add_block(new Block("Search", $nav, "left", 0));
 		if(count($images) > 0) {
-			$page->add_block(new Block("Images", $this->build_table($images, $query), "main", 10));
-			$this->display_paginator($page, "post/list$query", null, $this->page_number, $this->total_pages);
+			if($query) {
+				$page->add_block(new Block("Images", $this->build_table($images, "search=$query"), "main", 10));
+				$this->display_paginator($page, "post/list/$query", null, $this->page_number, $this->total_pages);
+			}
+			else {
+				$page->add_block(new Block("Images", $this->build_table($images, null), "main", 10));
+				$this->display_paginator($page, "post/list", null, $this->page_number, $this->total_pages);
+			}
 		}
 		else {
 			$page->add_block(new Block("No Images Found", "No images were found to match the search criteria"));