diff --git a/stylesheets/components/StoryViewer.scss b/stylesheets/components/StoryViewer.scss
index 8a090672c..3c353553e 100644
--- a/stylesheets/components/StoryViewer.scss
+++ b/stylesheets/components/StoryViewer.scss
@@ -4,10 +4,10 @@
 .StoryViewer {
   &__overlay {
     background-size: contain;
-    height: var(--window-height);
+    height: 100%;
     left: 0;
     position: absolute;
-    top: var(--titlebar-height);
+    top: 0;
     width: 100%;
     z-index: $z-index-popup-overlay;
   }
@@ -18,11 +18,11 @@
     background: $color-black-alpha-20;
     display: flex;
     flex-direction: column;
-    height: var(--window-height);
+    height: 100%;
     justify-content: center;
     left: 0;
     position: absolute;
-    top: var(--titlebar-height);
+    top: 0;
     width: 100%;
     z-index: $z-index-popup-overlay;
   }
@@ -34,7 +34,7 @@
       @include color-svg('../images/icons/v2/x-24.svg', $color-gray-15);
     }
     right: 28px;
-    top: var(--title-bar-drag-area-height);
+    top: 0;
     z-index: $z-index-above-above-base;
   }
 
@@ -255,7 +255,7 @@
   }
 
   &__animated-emojis {
-    height: var(--window-height);
+    height: 100%;
     position: absolute;
     width: 100%;
     z-index: $z-index-above-base;
@@ -265,7 +265,7 @@
     @include button-reset;
     align-items: center;
     display: flex;
-    height: var(--window-height);
+    height: 100%;
     position: absolute;
     width: 25%;
     z-index: $z-index-above-above-base;
diff --git a/stylesheets/components/TitleBarContainer.scss b/stylesheets/components/TitleBarContainer.scss
index 45a920d29..7408e6231 100644
--- a/stylesheets/components/TitleBarContainer.scss
+++ b/stylesheets/components/TitleBarContainer.scss
@@ -60,5 +60,6 @@
   &__content {
     height: calc(100vh - var(--titlebar-height));
     position: relative;
+    overflow: hidden;
   }
 }