diff --git a/ext/index/theme.php b/ext/index/theme.php
index ebec6914..efc451f5 100644
--- a/ext/index/theme.php
+++ b/ext/index/theme.php
@@ -19,7 +19,7 @@ class IndexTheme extends Themelet {
 			$query = "search=".url_escape($search_string);
 			$page_title = html_escape($search_string);
 			if(count($images) > 0) {
-				$page->set_subheading("Page $page_number / $total_pages");
+				$page->set_subheading("Page {$this->page_number} / {$this->total_pages}");
 			}
 		}
 		if($this->page_number > 1 || count($this->search_terms) > 0) {
diff --git a/themes/default/layout.class.php b/themes/default/layout.class.php
index 9eb8c2f0..37294081 100644
--- a/themes/default/layout.class.php
+++ b/themes/default/layout.class.php
@@ -35,11 +35,11 @@ class Layout {
 
 		$contact = empty($contact_link) ? "" : "<br><a href='$contact_link'>Contact</a>";
 
-		if(empty($this->subheading)) {
+		if(empty($page->subheading)) {
 			$subheading = "";
 		}
 		else {
-			$subheading = "<div id='subtitle'>{$this->subheading}</div>";
+			$subheading = "<div id='subtitle'>{$page->subheading}</div>";
 		}
 
 		print <<<EOD