diff --git a/app/components/Search/Search.js b/app/components/Search/Search.js
index 3aff8239..914b9c2c 100644
--- a/app/components/Search/Search.js
+++ b/app/components/Search/Search.js
@@ -315,9 +315,12 @@ const Search = (props) => {
 
   const handleAutocompleteChange = (event, newValue) => {
     setSearchTerm(newValue || '');
+  };
 
-    if (newValue && newValue.trim() && suggestions.includes(newValue)) {
-      performSearch(newValue);
+  const handleOptionSelect = (event, selectedValue) => {
+    if (selectedValue && selectedValue.trim()) {
+      setSearchTerm(selectedValue);
+      performSearch(selectedValue);
       setShowSuggestions(false);
     }
   };
@@ -559,12 +562,10 @@ const Search = (props) => {
                 <Autocomplete
                   freeSolo
                   disabled={isInitializing}
-                  // TODO - search history is disabled (along with suggestions) because it isn't working properly.
-                  // if you select something from the search history, it shows 0 results even if the search actually
-                  // did have results.  Need to investigate this.
-                  options={showSuggestions ? suggestions : []} //searchHistory}
+                  options={[...new Set([...searchHistory, ...(showSuggestions ? suggestions : [])])]}
                   value={searchTerm}
                   onInputChange={handleAutocompleteChange}
+                  onChange={handleOptionSelect}
                   onClose={() => setShowSuggestions(false)}
                   renderInput={(params) => (
                     <TextField
diff --git a/app/constants/search-config.js b/app/constants/search-config.js
index d9b6dc66..b132297b 100644
--- a/app/constants/search-config.js
+++ b/app/constants/search-config.js
@@ -187,7 +187,7 @@ module.exports = {
   // UI and display settings
   ui: {
     searchHistorySize: 15,
-    enableSuggestions: false,  // TODO - DISABLED FOR NOW. Need to correct and then re-enable.
+    enableSuggestions: true,
     maxSuggestions: 8,
     showRelevanceScores: process.env.NODE_ENV === 'development',
     enableKeyboardShortcuts: true,