diff --git a/src/extensibility/ExtensionManagerDialog.js b/src/extensibility/ExtensionManagerDialog.js
index a9a70eb68f0..acfd61873fb 100644
--- a/src/extensibility/ExtensionManagerDialog.js
+++ b/src/extensibility/ExtensionManagerDialog.js
@@ -309,6 +309,7 @@ define(function (require, exports, module) {
             views   = [],
             $search,
             $searchClear,
+            $modalDlg,
             context = { Strings: Strings, showRegistry: !!brackets.config.extension_registry },
             models  = [];
 
@@ -335,6 +336,7 @@ define(function (require, exports, module) {
             $search.val("");
             views.forEach(function (view, index) {
                 view.filter("");
+                $modalDlg.scrollTop(0);
             });
 
             if (!updateSearchDisabled()) {
@@ -360,14 +362,15 @@ define(function (require, exports, module) {
         $dlg = dialog.getElement();
         $search = $(".search", $dlg);
         $searchClear = $(".search-clear", $dlg);
+        $modalDlg = $(".modal-body", $dlg);
 
         function setActiveTab($tab) {
             if (models[_activeTabIndex]) {
-                models[_activeTabIndex].scrollPos = $(".modal-body", $dlg).scrollTop();
+                models[_activeTabIndex].scrollPos = $modalDlg.scrollTop();
             }
             $tab.tab("show");
             if (models[_activeTabIndex]) {
-                $(".modal-body", $dlg).scrollTop(models[_activeTabIndex].scrollPos || 0);
+                $modalDlg.scrollTop(models[_activeTabIndex].scrollPos || 0);
                 clearSearch();
             }
         }
@@ -434,7 +437,7 @@ define(function (require, exports, module) {
             $(".spinner", $dlg).remove();
 
             views.forEach(function (view) {
-                view.$el.appendTo($(".modal-body", $dlg));
+                view.$el.appendTo($modalDlg);
             });
 
             // Update search UI before new tab is shown
@@ -454,6 +457,7 @@ define(function (require, exports, module) {
                 var query = $(this).val();
                 views.forEach(function (view) {
                     view.filter(query);
+                    $modalDlg.scrollTop(0);
                 });
             }).on("click", ".search-clear", clearSearch);