diff --git a/res/css/views/messages/_MLocationBody.scss b/res/css/views/messages/_MLocationBody.scss
index eefb39004e..e4135d46d4 100644
--- a/res/css/views/messages/_MLocationBody.scss
+++ b/res/css/views/messages/_MLocationBody.scss
@@ -18,6 +18,7 @@ limitations under the License.
     .mx_MLocationBody_map {
         width: 450px;
         height: 300px;
+        z-index: 0; // keeps the entire map under the message action bar
 
         border-radius: $timeline-image-border-radius;
     }