diff --git a/mozilla/mailnews/base/resources/content/searchBar.js b/mozilla/mailnews/base/resources/content/searchBar.js
index 626546c29ab..37e97c98034 100644
--- a/mozilla/mailnews/base/resources/content/searchBar.js
+++ b/mozilla/mailnews/base/resources/content/searchBar.js
@@ -293,7 +293,8 @@ function restorePreSearchView()
     else
       ClearMessagePane();
   }
-  ScrollToMessageAfterFolderLoad(null);
+  if (!scrolled)
+    ScrollToMessageAfterFolderLoad(null);
 }
 
 function onSearch(aSearchTerms)