diff --git a/static/style.css b/static/style.css
index b97f5df..24cfbf3 100644
--- a/static/style.css
+++ b/static/style.css
@@ -69,6 +69,8 @@ ul {
 
 #app > main {
   flex: 1;
+  /* https://github.com/linusg/owntracks-ui/issues/6 */
+  display: flex;
 }
 
 .button,
@@ -197,6 +199,11 @@ ul {
   white-space: nowrap;
 }
 
+.leaflet-container {
+  /* https://github.com/linusg/owntracks-ui/issues/6 */
+  height: auto !important;
+}
+
 .leaflet-container .leaflet-popup {
   filter: var(--drop-shadow);
 }