diff --git a/app/scenes/Search/components/FilterOption.js b/app/scenes/Search/components/FilterOption.js
index ac72c0cc0..627597d9e 100644
--- a/app/scenes/Search/components/FilterOption.js
+++ b/app/scenes/Search/components/FilterOption.js
@@ -44,6 +44,7 @@ const Anchor = styled('a')`
 
   ${HelpText} {
     font-weight: normal;
+    user-select: none;
   }
 
   &:hover {
diff --git a/app/scenes/Search/components/FilterOptions.js b/app/scenes/Search/components/FilterOptions.js
index 1a479a25c..513528480 100644
--- a/app/scenes/Search/components/FilterOptions.js
+++ b/app/scenes/Search/components/FilterOptions.js
@@ -31,16 +31,21 @@ const FilterOptions = ({
 
   return (
     <DropdownButton label={activeKey ? selectedLabel : defaultLabel}>
-      <List>
-        {options.map(option => (
-          <FilterOption
-            key={option.key}
-            onSelect={() => onSelect(option.key)}
-            active={option.key === activeKey}
-            {...option}
-          />
-        ))}
-      </List>
+      {({ closeMenu }) => (
+        <List>
+          {options.map(option => (
+            <FilterOption
+              key={option.key}
+              onSelect={() => {
+                onSelect(option.key);
+                closeMenu();
+              }}
+              active={option.key === activeKey}
+              {...option}
+            />
+          ))}
+        </List>
+      )}
     </DropdownButton>
   );
 };
@@ -78,7 +83,7 @@ const SearchFilter = props => {
     >
       {({ closePortal }) => (
         <MaxHeightScrollable>
-          <Content>{props.children}</Content>
+          <Content>{props.children({ closeMenu: closePortal })}</Content>
         </MaxHeightScrollable>
       )}
     </DropdownMenu>