diff --git a/src/components/ForestTypeModal.js b/src/components/ForestTypeModal.js
index 6d6c918b..720425bd 100644
--- a/src/components/ForestTypeModal.js
+++ b/src/components/ForestTypeModal.js
@@ -23,14 +23,8 @@ function ForestTypeModal({ data, setIsForestTypeModalOpen }) {
           {data.la ? <i>{data.la}</i> : null}
         </Modal.Header>
       }
-      onClose={(e) => {
-        e.stopPropagation();
-        setIsForestTypeModalOpen(false);
-      }}
-      onOpen={(e) => {
-        e.stopPropagation();
-        setIsForestTypeModalOpen(true);
-      }}
+      onClose={(e) => setIsForestTypeModalOpen(false)}
+      onOpen={(e) => setIsForestTypeModalOpen(true)}
       trigger={<Button active icon="info" />}
     />
   );
diff --git a/src/components/LocationResult.js b/src/components/LocationResult.js
index 3c11eba7..a0c9e575 100644
--- a/src/components/LocationResult.js
+++ b/src/components/LocationResult.js
@@ -82,9 +82,11 @@ function LocationResult() {
                           }
                           key={key}
                           value={key}
-                          onClick={(e, { value: forestType }) =>
-                            selectForestType(forestType)
-                          }
+                          onClick={(e, { value: forestType }) => {
+                            if (e.target.getAttribute('role') === 'option') {
+                              selectForestType(forestType);
+                            }
+                          }}
                         />
                       );
                     })}