diff --git a/src/components/chat_view/chat_view.scss b/src/components/chat_view/chat_view.scss
index c490546bc..d8031b1a7 100644
--- a/src/components/chat_view/chat_view.scss
+++ b/src/components/chat_view/chat_view.scss
@@ -48,6 +48,10 @@
 
   .footer {
     position: sticky;
+    display: flex;
+    align-items: stretch;
+    flex-direction: column;
+    padding: 0;
     bottom: 0;
     z-index: 1;
   }
diff --git a/src/components/chat_view/chat_view.vue b/src/components/chat_view/chat_view.vue
index f24c892fd..254b8712e 100644
--- a/src/components/chat_view/chat_view.vue
+++ b/src/components/chat_view/chat_view.vue
@@ -49,7 +49,7 @@
         </div>
         <div
           ref="footer"
-          class="panel-body footer"
+          class="panel-footer -flexible-height footer"
         >
           <div
             class="jump-to-bottom-button"