diff --git a/src/index.pug b/src/index.pug
index 6de9a9e10db98b2c2f8ce13191c3f3aead97a058..0fd12f3aac4e310b5a8677c279a00515189585a3 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -24,7 +24,7 @@ html(lang="en")
       nav#main__menu.left-menu.jsLeftMenu
         include menu-left.pug
 
-      main#viewport.content.notLoggedIn(no-render)
+      main#viewport.content.notLoggedIn
 
         if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
           #dashboard(hidden, data-view="dashboard").no-sidebar.with-padding
diff --git a/src/scripts/firefox-scroll.js b/src/scripts/firefox-scroll.js
index 4405aa69c407835edfc0571272ac46d8ac668de2..3b9bb180bd09a5056308504b5fae162c4bc8ea4e 100644
--- a/src/scripts/firefox-scroll.js
+++ b/src/scripts/firefox-scroll.js
@@ -1,6 +1,8 @@
 document.addEventListener("DOMContentLoaded", () => {
   const resizeChat = () => {
-    let isMobile = window.innerHeight < 993;
+    let isMobile = window.innerWidth < 993;
+    let isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
+    let isFirefoxMobile = navigator.platform.toLowerCase().indexOf("mobile") > -1 || navigator.platform.toLowerCase().indexOf("tablet") > -1;
     let chatBox = Array.from(document.querySelectorAll("solid-xmpp-chat"))
       .map((el) => el.shadowRoot ? el.shadowRoot.getElementById("conversejs") : false)
       .filter((el) => el)
@@ -19,10 +21,8 @@ document.addEventListener("DOMContentLoaded", () => {
             let viewportChat = Array.from(
               document.querySelectorAll("#viewport .chat-view")
             );
-            let headerOffset = document.querySelector('#header').offsetHeight;
-            let intermediateOffset = Array.from(document.querySelectorAll(".content-box__header")).filter(el=>el.offsetParent!==null?el:null)[0].offsetHeight;
             viewportChat.forEach(
-              (c) => (c.style.height = isMobile ? "calc(100vh - "+String(headerOffset+intermediateOffset)+"px - 57px)" : "calc(100vh - "+String(headerOffset+intermediateOffset)+"px)")
+              (c) => (c.style.height = isMobile ? (isFirefox && isFirefoxMobile) ? "calc(100vh - 106px - 57px)" : "calc(100vh - 106px)" : "calc(100vh - 64px - 83px)")
             );
           }
         }