diff --git a/src/frontend/src/Components/map/LocationSearch.js b/src/frontend/src/Components/map/LocationSearch.js
index 5ec3cac30..a9355ca0c 100644
--- a/src/frontend/src/Components/map/LocationSearch.js
+++ b/src/frontend/src/Components/map/LocationSearch.js
@@ -55,6 +55,11 @@ export default function LocationSearch(props) {
       onSearch={loadLocationOptions}
       options={options}
       placeholder="Search for a location..."
+      highlightOnlyResult={true}
+      selectHint={(shouldSelect, e) => {
+        // Select the hint if the user hits 'enter'
+        return e.keyCode === 13 || shouldSelect;
+      }}
       renderMenuItemChildren={location => (
         <div>
           <span>{location.properties.fullAddress}</span>