diff --git a/client/less/drawers.less b/client/less/drawers.less
index 102e412154..f9b729c944 100644
--- a/client/less/drawers.less
+++ b/client/less/drawers.less
@@ -62,10 +62,6 @@
     }
 }
 
-.drawer-content {
-    overflow-y: auto;
-}
-
 .drawer-action-bar {
     position: absolute;
     top: 0;
diff --git a/client/less/map.less b/client/less/map.less
index 3a2311aa28..86babb3a3e 100644
--- a/client/less/map.less
+++ b/client/less/map.less
@@ -21,6 +21,7 @@
 }
 
 .map-filter + .input-group-addon {
+  min-width: inherit;
   width: 40px;
   color: darkgreen;
   background-color: #fff;
diff --git a/common/app/routes/challenges/components/map/Header.jsx b/common/app/routes/challenges/components/map/Header.jsx
index 8ea56cf3d1..0a7c255ae0 100644
--- a/common/app/routes/challenges/components/map/Header.jsx
+++ b/common/app/routes/challenges/components/map/Header.jsx
@@ -41,6 +41,7 @@ export class Header extends PureComponent {
 
   handleKeyDown(e) {
     if (e.keyCode === ESC) {
+      e.preventDefault();
       this.props.clearFilter();
     }
   }