diff --git a/src/pages/search/Search.js b/src/pages/search/Search.js
index 4587f18b482ccf511ed4a59d83caf2bcf3a13cb9..a1c0044118e8373b06e4335e97f36b759329e7ff 100644
--- a/src/pages/search/Search.js
+++ b/src/pages/search/Search.js
@@ -1537,7 +1537,7 @@ const Search = () => {
   const [searchFields, setSearchFields] = useState([]);
   const [standardFields, setStandardFields] = useState([]);
   const [sources, setSources] = useState([]);
-  const [searchResults, setSearchResults] = useState();
+  const [searchResults, setSearchResults] = useState([]);
   const [searchCount, setSearchCount] = useState();
   const [fieldCount, setFieldCount] = useState([]);
   const [isReadOnlyModalOpen, setIsReadOnlyModalOpen] = useState(false);
@@ -1640,6 +1640,21 @@ const Search = () => {
     );
   };
 
+  const onFormSubmit = () => {
+    setIsLoading(true);
+    const queriesWithIndices = createBasicQueriesBySource(
+      standardFields,
+      basicSearch,
+      selectedSources,
+      availableSources
+    );
+    searchQuery(queriesWithIndices).then((result) => {
+      setSearchResults(result);
+      setSelectedTabNumber(1);
+      setIsLoading(false);
+    });
+  };
+
   const tabsContent = [
     {
       id: 'tab1',
@@ -1769,39 +1784,23 @@ const Search = () => {
               <EuiFlexGroup>
                 <EuiFlexItem>
                   <EuiSpacer size="s" />
-                  <EuiFlexGroup>
-                    <EuiFlexItem>
-                      <EuiFieldSearch
-                        value={basicSearch}
-                        onChange={(e) => setBasicSearch(e.target.value)}
-                        placeholder="Search..."
-                        fullWidth
-                      />
-                    </EuiFlexItem>
-                    <EuiFlexItem grow={false}>
-                      <EuiButton
-                        fill
-                        isDisabled={advancedSearch}
-                        onClick={() => {
-                          setIsLoading(true);
-                          const queriesWithIndices = createBasicQueriesBySource(
-                            standardFields,
-                            basicSearch,
-                            selectedSources,
-                            availableSources
-                          );
-                          searchQuery(queriesWithIndices).then((result) => {
-                            // sessionStorage.setItem("searchResults", JSON.stringify(result))
-                            setSearchResults(result);
-                            setSelectedTabNumber(1);
-                            setIsLoading(false);
-                          });
-                        }}
-                      >
-                        Search
-                      </EuiButton>
-                    </EuiFlexItem>
-                  </EuiFlexGroup>
+                  <form onSubmit={onFormSubmit}>
+                    <EuiFlexGroup>
+                      <EuiFlexItem>
+                        <EuiFieldSearch
+                          value={basicSearch}
+                          onChange={(e) => setBasicSearch(e.target.value)}
+                          placeholder="Search..."
+                          fullWidth
+                        />
+                      </EuiFlexItem>
+                      <EuiFlexItem grow={false}>
+                        <EuiButton type="submit" fill isDisabled={advancedSearch}>
+                          Search
+                        </EuiButton>
+                      </EuiFlexItem>
+                    </EuiFlexGroup>
+                  </form>
                   {isLoading && (
                     <EuiFlexGroup>
                       <EuiFlexItem>