Merge remote-tracking branch 'upstream/pull/3708'

app/assets/stylesheets/common.scss

@@ -522,6 +522,13 @@ body.small-nav {
       height: 50%;
     }
 
+    #map-ui {
+      z-index: 9999;
+      width: 100%;
+      height: 50%;
+      overflow-y: scroll;
+    }
+
     .overlay-sidebar {
       #sidebar {
         position: absolute;
@@ -530,16 +537,10 @@ body.small-nav {
         overflow: hidden;
       }
 
-      #map {
+      #map, #map-ui {
         height: 100%;
       }
     }
-
-    #map-ui {
-      z-index: 9999;
-      width: 100%;
-      overflow-y: scroll;
-    }
   }
 }