diff --git a/public/torrents.php b/public/torrents.php
index ee11320c5..4a621e882 100644
--- a/public/torrents.php
+++ b/public/torrents.php
@@ -702,7 +702,6 @@
 if (isset($searchstr))
 {
 	if (!isset($_GET['notnewword']) || !$_GET['notnewword']){
-		insert_suggest($searchstr, $CURUSER['id']);
 		$notnewword="";
 	}
 	else{
@@ -956,6 +955,9 @@
 
 if ($count)
 {
+    if (isset($searchstr) && (!isset($_GET['notnewword']) || !$_GET['notnewword'])){
+        insert_suggest($searchstr, $CURUSER['id']);
+    }
 	if ($addparam != "")
 	{
 		if ($pagerlink != "")