diff --git a/app/scenes/Search/Search.js b/app/scenes/Search/Search.js
index 9814a519..6c7b47dd 100644
--- a/app/scenes/Search/Search.js
+++ b/app/scenes/Search/Search.js
@@ -53,7 +53,10 @@ class Search extends React.Component<Props> {
 
   componentDidMount() {
     this.handleTermChange();
-    this.handleQueryChange();
+
+    if (this.props.location.search) {
+      this.handleQueryChange();
+    }
   }
 
   componentDidUpdate(prevProps) {
diff --git a/app/scenes/Search/components/FilterOptions.js b/app/scenes/Search/components/FilterOptions.js
index 072dfa85..1a479a25 100644
--- a/app/scenes/Search/components/FilterOptions.js
+++ b/app/scenes/Search/components/FilterOptions.js
@@ -48,7 +48,6 @@ const FilterOptions = ({
 const Content = styled('div')`
   padding: 0 8px;
   width: 250px;
-  max-height: 50vh;
 
   p {
     margin-bottom: 0;
@@ -78,14 +77,20 @@ const SearchFilter = props => {
       leftAlign
     >
       {({ closePortal }) => (
-        <Content>
-          <Scrollable>{props.children}</Scrollable>
-        </Content>
+        <MaxHeightScrollable>
+          <Content>{props.children}</Content>
+        </MaxHeightScrollable>
       )}
     </DropdownMenu>
   );
 };
 
+const MaxHeightScrollable = styled(Scrollable)`
+  max-height: 50vh;
+  margin: -8px 0;
+  padding: 8px 0;
+`;
+
 const DropdownButton = styled(SearchFilter)`
   margin-right: 8px;
 `;