diff --git a/web/modals/chat/message-reactions-modal.css b/web/modals/chat/message-reactions-modal.css
index 63bbe36280..2117b578dd 100644
--- a/web/modals/chat/message-reactions-modal.css
+++ b/web/modals/chat/message-reactions-modal.css
@@ -6,6 +6,7 @@ div.modalContentContainer {
   flex-direction: column;
   font-size: var(--l-font-18);
   overflow-y: auto;
+  max-height: 100%;
 }
 
 div.userRowContainer {
diff --git a/web/modals/chat/pinned-messages-modal.css b/web/modals/chat/pinned-messages-modal.css
index ea84d0b049..8e696caef0 100644
--- a/web/modals/chat/pinned-messages-modal.css
+++ b/web/modals/chat/pinned-messages-modal.css
@@ -1,5 +1,7 @@
 .container {
   height: 80vh;
+  overflow: scroll;
+  max-height: 100%;
 }
 
 hr.separator {
diff --git a/web/modals/modal.css b/web/modals/modal.css
index 7ffa30816c..0a78550f6e 100644
--- a/web/modals/modal.css
+++ b/web/modals/modal.css
@@ -74,6 +74,7 @@ h2.subtitle {
 
 .modalContentContainer {
   padding: 16px 32px 24px;
+  overflow: hidden;
 }
 
 .buttonContainer {
diff --git a/web/modals/search-modal.css b/web/modals/search-modal.css
index b8ded31280..9b5d929408 100644
--- a/web/modals/search-modal.css
+++ b/web/modals/search-modal.css
@@ -2,4 +2,5 @@
   display: flex;
   flex-direction: column;
   overflow: hidden;
+  max-height: 100%;
 }
diff --git a/web/modals/threads/gallery/thread-settings-media-gallery.css b/web/modals/threads/gallery/thread-settings-media-gallery.css
index b83ab901a4..916dc2ff98 100644
--- a/web/modals/threads/gallery/thread-settings-media-gallery.css
+++ b/web/modals/threads/gallery/thread-settings-media-gallery.css
@@ -5,6 +5,7 @@ div.container {
   justify-content: flex-start;
   height: 80vh;
   padding-top: 16px;
+  max-height: 100%;
 }
 
 div.mediaContainer {
diff --git a/web/modals/threads/notifications/notifications-modal.css b/web/modals/threads/notifications/notifications-modal.css
index f752f23154..7eb1771740 100644
--- a/web/modals/threads/notifications/notifications-modal.css
+++ b/web/modals/threads/notifications/notifications-modal.css
@@ -4,6 +4,8 @@ div.container {
   row-gap: 20px;
   min-width: 343px;
   width: min-content;
+  overflow: auto;
+  max-height: 100%;
 }
 
 p.notice {
diff --git a/web/modals/threads/sidebars/sidebars-modal.css b/web/modals/threads/sidebars/sidebars-modal.css
index 99766e71f2..1db1870de0 100644
--- a/web/modals/threads/sidebars/sidebars-modal.css
+++ b/web/modals/threads/sidebars/sidebars-modal.css
@@ -3,6 +3,7 @@ div.sidebarListContainer {
   flex-direction: column;
   line-height: var(--line-height-text);
   height: 80vh;
+  overflow: hidden;
 }
 
 div.sidebarList {