diff --git a/static/styles/zulip.css b/static/styles/zulip.css
index 9e4621e2e7..7efa71b952 100644
--- a/static/styles/zulip.css
+++ b/static/styles/zulip.css
@@ -547,7 +547,8 @@ ul.filters li.out_of_home_view {
 }
 
 .message_area_padder {
-    margin-top: 10px;
+    /* The height of the header and the tabbar plus a small gap */
+    margin-top: 68px;
     /* This is needed for the floating recipient bar
      in Firefox only, for some reason; otherwise it gets
      a scrollbar */