diff --git a/js/apps/admin-ui/src/components/users/UserDataTable.tsx b/js/apps/admin-ui/src/components/users/UserDataTable.tsx
index 98c92b6e24..1db1d31baa 100644
--- a/js/apps/admin-ui/src/components/users/UserDataTable.tsx
+++ b/js/apps/admin-ui/src/components/users/UserDataTable.tsx
@@ -104,6 +104,7 @@ export function UserDataTable() {
   const [realm, setRealm] = useState<RealmRepresentation | undefined>();
   const [selectedRows, setSelectedRows] = useState<UserRepresentation[]>([]);
   const [searchType, setSearchType] = useState<SearchType>("default");
+  const [searchDropdownOpen, setSearchDropdownOpen] = useState(false);
   const [activeFilters, setActiveFilters] = useState<UserAttribute[]>([]);
   const [profile, setProfile] = useState<UserProfileConfig>({});
   const [query, setQuery] = useState("");
@@ -153,7 +154,7 @@ export function UserDataTable() {
       params.search = searchParam;
     }
 
-    if (!listUsers && !searchParam) {
+    if (!listUsers && !(params.search || params.q)) {
       return [];
     }
 
@@ -277,6 +278,8 @@ export function UserDataTable() {
   const toolbar = () => {
     return (
       <UserDataTableToolbarItems
+        searchDropdownOpen={searchDropdownOpen}
+        setSearchDropdownOpen={setSearchDropdownOpen}
         realm={realm}
         hasSelectedRows={selectedRows.length === 0}
         toggleDeleteDialog={toggleDeleteDialog}
diff --git a/js/apps/admin-ui/src/components/users/UserDataTableToolbarItems.tsx b/js/apps/admin-ui/src/components/users/UserDataTableToolbarItems.tsx
index 253ba392ad..39212b0925 100644
--- a/js/apps/admin-ui/src/components/users/UserDataTableToolbarItems.tsx
+++ b/js/apps/admin-ui/src/components/users/UserDataTableToolbarItems.tsx
@@ -21,6 +21,8 @@ import { UserDataTableAttributeSearchForm } from "./UserDataTableAttributeSearch
 import DropdownPanel from "../dropdown-panel/DropdownPanel";
 
 type UserDataTableToolbarItemsProps = {
+  searchDropdownOpen: boolean;
+  setSearchDropdownOpen: (open: boolean) => void;
   realm: RealmRepresentation;
   hasSelectedRows: boolean;
   toggleDeleteDialog: () => void;
@@ -40,6 +42,8 @@ type UserDataTableToolbarItemsProps = {
 };
 
 export function UserDataTableToolbarItems({
+  searchDropdownOpen,
+  setSearchDropdownOpen,
   realm,
   hasSelectedRows,
   toggleDeleteDialog,
@@ -59,7 +63,6 @@ export function UserDataTableToolbarItems({
 }: UserDataTableToolbarItemsProps) {
   const { t } = useTranslation();
   const [kebabOpen, setKebabOpen] = useState(false);
-  const [searchDropdownOpen, setSearchDropdownOpen] = useState(false);
 
   const { hasAccess } = useAccess();
 
@@ -130,13 +133,19 @@ export function UserDataTableToolbarItems({
             setActiveFilters={setActiveFilters}
             profile={profile}
             createAttributeSearchChips={createAttributeSearchChips}
-            searchUserWithAttributes={searchUserWithAttributes}
+            searchUserWithAttributes={() => {
+              searchUserWithAttributes();
+              setSearchDropdownOpen(false);
+            }}
           />
         </DropdownPanel>
         <Button
           icon={<ArrowRightIcon />}
           variant="control"
-          onClick={searchUserWithAttributes}
+          onClick={() => {
+            searchUserWithAttributes();
+            setSearchDropdownOpen(false);
+          }}
           aria-label={t("searchAttributes")}
         />
       </>