diff --git a/www/caddy/Makefile b/www/caddy/Makefile
index 3132d78e4..344360c87 100644
--- a/www/caddy/Makefile
+++ b/www/caddy/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		caddy
 PLUGIN_VERSION=		2.0.4
-PLUGIN_REVISION=	2
+PLUGIN_REVISION=	3
 PLUGIN_DEPENDS=		caddy-custom
 PLUGIN_COMMENT=		Modern Reverse Proxy with Automatic HTTPS, Dynamic DNS and Layer4 Routing
 PLUGIN_MAINTAINER=	cedrik@pischem.com
diff --git a/www/caddy/pkg-descr b/www/caddy/pkg-descr
index 7e861f39c..71e674017 100644
--- a/www/caddy/pkg-descr
+++ b/www/caddy/pkg-descr
@@ -12,6 +12,7 @@ Add: DNS-01 challenge delegation via CNAME (contributed by sdsys-ch) (opnsense/p
 Fix: Enabling HTTP access log wrongly excluded the process logs (opnsense/plugins/pull/4974)
 Fix: fix setup.sh script not setting correct ownership in www user mode (opnsense/plugins/pull/4976)
 Fix: Prevent sudo on startup via skip_install_trust (opnsense/plugins/pull/5015)
+Fix: Fix race condition that moved domain filter selectpicker into invisible tab (opnsense/plugins/pull/5076)
 
 2.0.3
 
diff --git a/www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/reverse_proxy.volt b/www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/reverse_proxy.volt
index bf6de6252..9ea070147 100644
--- a/www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/reverse_proxy.volt
+++ b/www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/reverse_proxy.volt
@@ -260,12 +260,16 @@
 
 {% if entrypoint == 'reverse_proxy' %}
 
-                    // insert buttons and selectpicker
+                    // insert buttons and selectpicker only when the tab is actually visible
                     if (['{{formGridReverseProxy["table_id"]}}', '{{formGridHandle["table_id"]}}'].includes(grid_id)) {
+                        if (!$(e.target.hash).is(':visible')) {
+                            return;  // prevents the selectpicker from being moved into hidden tabs
+                        }
+
                         const header = $("#" + grid_id + "-header");
                         const $actionBar = header.find('.actionBar');
                         if ($actionBar.length) {
-                            $('#add_filter_container').detach().insertBefore($actionBar.find('.search')).show();
+                            $('#add_filter_container').detach().insertAfter($actionBar.find('.search')).show();
                         }
                     }
 
@@ -447,9 +451,6 @@
 </script>
 
 <style>
-    #add_filter_container {
-        float: left;
-    }
     .actions .dropdown-menu.pull-right {
         max-height: 400px;
         min-width: max-content;
@@ -462,20 +463,26 @@
         font-size: 16px;
         font-style: italic;
     }
-    #reverseFilterClear {
-        border-right: none;
+    #add_filter_container {
+        display: flex;
+        gap: 8px;
     }
-    #add_filter_container .bootstrap-select > .dropdown-toggle {
-        border-top-left-radius: 0;
-        border-bottom-left-radius: 0;
+    @media (max-width: 1024px) {
+        #reverseFilterClear {
+            flex: 1 1 100%;
+        }
+        #reverseFilter {
+            flex: 1 1 100%;
+        }
     }
+
 </style>
 
 <div id="add_filter_container" class="btn-group" style="display: none;">
     <button type="button" id="reverseFilterClear" class="btn btn-default" title="{{ lang._('Clear Selection') }}">
         <i id="reverseFilterIcon" class="fa fa-fw fa-filter"></i>
     </button>
-    <select id="reverseFilter" class="selectpicker form-control" multiple data-live-search="true" data-width="300px" data-size="10" data-container="body" title="{{ lang._('Filter by Domain') }}">
+    <select id="reverseFilter" class="selectpicker form-control" multiple data-live-search="true" data-width="200px" data-size="10" data-container="body" title="{{ lang._('Filter by Domain') }}">
     </select>
 </div>