diff --git a/inc/media.php b/inc/media.php
index 508869b3b30722acdc694e0dc8988fa9a4a07920..29c3d0153475a8ad639ab65f9d32da2fe8857852 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -759,7 +759,7 @@ function media_tab_search($ns,$auth=null) {
     echo '<div class="search">'.NL;
 
     media_searchform($ns, $query, true);
-    if ($do == 'searchlist') {
+    if ($do == 'searchlist' || $query) {
         media_searchlist($query,$ns,$auth,true,_media_get_sort_type());
     }
     echo '</div>'.NL;
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index c74633523c5ff2732c9645882f6fa8075cf9ab17..841baa93f4eed3fcb717f99a7dfb8a201883199e 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -135,7 +135,7 @@ var dw_mediamanager = {
         });
         $sortBy.children('input').change(function (event) {
             dw_mediamanager.set_fileview_sort();
-            dw_mediamanager.list.call(this, event);
+            dw_mediamanager.list.call(jQuery('#dw__mediasearch')[0] || this, event);
         });
     },