diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js
index 074c51de9bb..ce8ec3a9b03 100644
--- a/src/search/FindInFiles.js
+++ b/src/search/FindInFiles.js
@@ -418,7 +418,6 @@ define(function (require, exports, module) {
             $searchContent
                 .empty()
                 .append(Mustache.render(searchResultsTemplate, {searchList: searchList, Strings: Strings}))
-                .scrollTop(0)        // Otherwise scroll pos from previous contents is remembered
                 .off(".searchList")  // Remove the old events
             
                 // Add the click event listener directly on the table parent
@@ -497,6 +496,7 @@ define(function (require, exports, module) {
                 $selectedRow = null;
             }
             searchResultsPanel.show();
+            $searchContent.scrollTop(0); // Otherwise scroll pos from previous contents is remembered
 
             if (dialog) {
                 dialog._close();
diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js
index 269f0184f17..5b5667186e8 100644
--- a/src/search/FindReplace.js
+++ b/src/search/FindReplace.js
@@ -587,6 +587,7 @@ define(function (require, exports, module) {
         });
 
         replaceAllPanel.show();
+        $replaceAllTable.scrollTop(0); // Otherwise scroll pos from previous contents is remembered
     }
 
     /** Shows the Find-Replace search bar at top */