diff --git a/src/components/ResourceBrowser/ResourceList/K8SResourceList.tsx b/src/components/ResourceBrowser/ResourceList/K8SResourceList.tsx
index 932fb754fc..7539330677 100644
--- a/src/components/ResourceBrowser/ResourceList/K8SResourceList.tsx
+++ b/src/components/ResourceBrowser/ResourceList/K8SResourceList.tsx
@@ -67,23 +67,29 @@ export const K8SResourceList = ({
     const searchText = searchParams[SEARCH_QUERY_PARAM_KEY] || ''
 
     /* TODO: what to do with the error? */
-    const [resourceListLoader, _resourceList, /*resourceListDataError*/, reloadResourceListData] = useAsync(() => {
-        if (!selectedResource || selectedResource.gvk.Kind === SIDEBAR_KEYS.nodeGVK.Kind) {
-            return null
-        }
-        return abortPreviousRequests(
-            () => getResourceList(
-                getResourceListPayload(
-                    clusterId,
-                    selectedNamespace.value.toLowerCase(),
-                    selectedResource,
-                    location.search,
-                ),
-                abortControllerRef.current.signal,
-            ),
-            abortControllerRef,
-        )
-    }, [selectedResource, clusterId, selectedNamespace])
+    const [resourceListLoader, _resourceList, /*resourceListDataError*/, reloadResourceListData] = useAsync(
+        () => {
+            if (!selectedResource || selectedResource.gvk.Kind === SIDEBAR_KEYS.nodeGVK.Kind) {
+                return null
+            }
+            return abortPreviousRequests(
+                () =>
+                    getResourceList(
+                        getResourceListPayload(
+                            clusterId,
+                            selectedNamespace.value.toLowerCase(),
+                            selectedResource,
+                            location.search,
+                        ),
+                        abortControllerRef.current.signal,
+                    ),
+                abortControllerRef,
+            )
+        },
+        [selectedResource, clusterId, selectedNamespace],
+        true,
+        { resetOnChange: true },
+    )
 
     const resourceList = _resourceList?.result || null
 
@@ -91,6 +97,7 @@ export const K8SResourceList = ({
 
     useEffect(() => {
         if (!resourceList) {
+            setFilteredResourceList(null)
             return
         }
         switch (selectedResource?.gvk.Kind) {
diff --git a/src/components/common/DynamicTabs/DynamicTabs.tsx b/src/components/common/DynamicTabs/DynamicTabs.tsx
index 3e5ba6164c..8f3590b3e8 100644
--- a/src/components/common/DynamicTabs/DynamicTabs.tsx
+++ b/src/components/common/DynamicTabs/DynamicTabs.tsx
@@ -146,13 +146,17 @@ const DynamicTabs = ({
                     >
                         {getTabNavLink(tab, isFixed)}
                         {_showNameOnSelect && (
-                            <div
-                                className="dynamic-tab__close icon-dim-16 flex ml-auto"
-                                data-id={tab.id}
+                            <button
+                                type="button"
+                                className="dc__unset-button-styles pr-12"
+                                aria-label={`Stop tab ${tab.name}`}
                                 onClick={handleTabStopAction}
+                                data-id={tab.id}
                             >
-                                <Cross className="icon-dim-16 cursor p-2 fcn-6 scn-6" />
-                            </div>
+                                <div className="dynamic-tab__close flex br-4">
+                                    <Cross className="icon-dim-16 cursor p-2 fcn-6 scn-6" />
+                                </div>
+                            </button>
                         )}
                         {!isFixed && (
                             <button