diff --git a/module/action/js/trash.ui.js b/module/action/js/trash.ui.js
new file mode 100644
index 0000000000..6e923ddf63
--- /dev/null
+++ b/module/action/js/trash.ui.js
@@ -0,0 +1,13 @@
+window.afterPageUpdate = function(target, info)
+{
+    if(info.name !== 'featureBar') return;
+    const $searchToggle = $(target).find('.search-form-toggle');
+    if(!$searchToggle.length)
+    {
+        $searchToggle.closest('.show-search-form').removeClass('show-search-form');
+        $('.search-form[data-module="trash"]').remove();
+        return;
+    }
+
+    if(!$searchToggle.parent().hasClass('active')) zui.updateSearchForm('trash');
+}
diff --git a/module/action/ui/trash.html.php b/module/action/ui/trash.html.php
index a1cdc7f52b..af19e89400 100644
--- a/module/action/ui/trash.html.php
+++ b/module/action/ui/trash.html.php
@@ -34,7 +34,7 @@ featureBar
 (
     set::current($currentObjectType),
     set::linkParams("objectType={key}&type={$type}&byQuery=&queryID=&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"),
-    li(searchToggle(set::module('trash')), setClass($currentObjectType != 'all' ? '' : 'hidden', $byQuery ? 'active' : ''))
+    $currentObjectType != 'all' ? li(searchToggle(set::module('trash')), setClass($byQuery ? 'active' : '')) : null
 );
 
 toolbar
@@ -78,5 +78,3 @@ dtable
     set::userMap($users),
     set::footPager(usePager())
 );
-
-jsVar('window.afterPageUpdate', jsRaw("(target,info) => info.name === 'featureBar' && !$(target).find('.active>.search-form-toggle').length && zui.updateSearchForm('trash');"));