diff --git a/mailnews/base/search/resources/content/searchTermOverlay.js b/mailnews/base/search/resources/content/searchTermOverlay.js
index ae84deb5cf5..00dfcc75b2e 100644
--- a/mailnews/base/search/resources/content/searchTermOverlay.js
+++ b/mailnews/base/search/resources/content/searchTermOverlay.js
@@ -205,7 +205,7 @@ function initializeSearchRows(scope, searchTerms)
 function scrollToLastSearchTerm(index)
 {
     if (index > 0)
-      gSearchTermList.ensureIndexIsVisible(index-1);
+      gSearchTermList.ensureIndexIsVisible(index);
 }
  
 function onMore(event, rowNumber)
@@ -218,7 +218,7 @@ function onMore(event, rowNumber)
         document.getElementById("less0").removeAttribute("disabled");
 
     // the user just added a term, so scroll to it
-    scrollToLastSearchTerm(gTotalSearchTerms);
+    scrollToLastSearchTerm(gTotalSearchTerms == 1 ? 0 : rowNumber + 1);
 }
 
 function onLess(event, rowNumber)