diff --git a/classes/class_search.php b/classes/class_search.php
index 2851bfa8..28441681 100644
--- a/classes/class_search.php
+++ b/classes/class_search.php
@@ -136,7 +136,7 @@ function search($Query='', $CachePrefix='', $CacheLength=0, $ReturnData=array(),
 	}
 	
 	function limit($Start, $Length, $MaxMatches=SPHINX_MATCHES_START) {
-		if(check_perms('site_search_many')) {
+		if(check_perms('site_search_many') && empty($_GET['limit_matches'])) {
 			$MaxMatches = 500000; 
 		}
 		$this->SetLimits((int)$Start, (int)$Length, $MaxMatches, 0);
diff --git a/sections/torrents/browse2.php b/sections/torrents/browse2.php
index 901467f9..13a7c086 100644
--- a/sections/torrents/browse2.php
+++ b/sections/torrents/browse2.php
@@ -538,6 +538,12 @@ function header_link($SortKey,$DefaultWay="desc") {
 					</select>
 				</td>
 			</tr>
+<?	if(check_perms('site_search_many')) { ?>
+			<tr>
+				<td class="label">Limited search results:</td>
+				<td><input type="checkbox" value="1" name="limit_matches" <?selected('limit_matches',1,'checked')?> /></td>
+			</tr>
+<?	} ?>
 		</table>
 		<table class="cat_list">
 <?