diff --git a/packages/react-core/src/components/SearchInput/SearchInput.tsx b/packages/react-core/src/components/SearchInput/SearchInput.tsx
index 5b9ae47d426..d9f8a125346 100644
--- a/packages/react-core/src/components/SearchInput/SearchInput.tsx
+++ b/packages/react-core/src/components/SearchInput/SearchInput.tsx
@@ -357,7 +357,7 @@ const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
   if (!!onSearch || attributes.length > 0 || !!onToggleAdvancedSearch) {
     if (attributes.length > 0) {
       const AdvancedSearch = (
-        <span>
+        <div>
           <AdvancedSearchMenu
             value={value}
             parentRef={searchInputRef}
@@ -375,7 +375,7 @@ const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
             getAttrValueMap={getAttrValueMap}
             isSearchMenuOpen={isSearchMenuOpen}
           />
-        </span>
+        </div>
       );
 
       const AdvancedSearchWithPopper = (
diff --git a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
index 0d47549c590..478872de33e 100644
--- a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
+++ b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
@@ -241,7 +241,7 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
         </svg>
       </button>
     </div>
-    <span
+    <div
       class=""
       data-popper-escaped="true"
       data-popper-placement="bottom-start"
@@ -431,7 +431,7 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
           </div>
         </div>
       </div>
-    </span>
+    </div>
   </div>
 </DocumentFragment>
 `;