diff --git a/mod/dirfind.php b/mod/dirfind.php
index 39c13dcb73..9e02a47e20 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -156,6 +156,7 @@ function dirfind_content(&$a, $prefix = "") {
 		$o .= replace_macros($tpl,array(
 			'title' => sprintf( t('People Search - %s'), $search),
 			'$entries' => $entries,
+			'$paginate' => paginate($a),
 		));
 
 		}
@@ -165,6 +166,5 @@ function dirfind_content(&$a, $prefix = "") {
 
 	}
 
-	$o .= paginate($a);
 	return $o;
 }
diff --git a/mod/match.php b/mod/match.php
index 30d057a0da..380f6e74a4 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -82,6 +82,7 @@ function match_content(&$a) {
 		$o .= replace_macros($tpl,array(
 			'$title' => t('Profile Match'),
 			'entries' => $entries,
+			'$paginate' => paginate($a),
 		));
 
 		}
@@ -91,6 +92,5 @@ function match_content(&$a) {
 
 	}
 
-	$o .= paginate($a);
 	return $o;
 }
diff --git a/view/templates/match.tpl b/view/templates/match.tpl
index db612e3dc5..d269a253bc 100644
--- a/view/templates/match.tpl
+++ b/view/templates/match.tpl
@@ -36,3 +36,5 @@
 {{/foreach}}
 
 <div class="clear"></div>
+
+{{$paginate}}