diff --git a/packages/react/src/components/DataTable/TableToolbarSearch.js b/packages/react/src/components/DataTable/TableToolbarSearch.js
index bf2c81b742ec..c00a41593825 100644
--- a/packages/react/src/components/DataTable/TableToolbarSearch.js
+++ b/packages/react/src/components/DataTable/TableToolbarSearch.js
@@ -80,6 +80,9 @@ const TableToolbarSearch = ({
   const handleExpand = (event, value = !expanded) => {
     if (!controlled && (!persistent || (!persistent && !persistant))) {
       setExpandedState(value);
+      if (value) {
+        setFocusTarget(searchRef);
+      }
     }
     if (onExpand) {
       onExpand(event, value);
@@ -87,7 +90,6 @@ const TableToolbarSearch = ({
   };
 
   const onClick = e => {
-    setFocusTarget(searchRef);
     handleExpand(e, true);
   };