diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index ab1e6ce74..6eb86837c 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -9,8 +9,9 @@
     --popup-display: flex;
 
     inset: 0 auto auto 50%;
-    min-inline-size: min(25ch, calc(100vw - (var(--panel-padding) * 2)));
+    max-block-size: 70dvh;
     max-inline-size: min(55ch, calc(100vw - (var(--panel-padding) * 2)));
+    min-inline-size: min(25ch, calc(100vw - (var(--panel-padding) * 2)));
     overflow: auto;
     position: absolute;
     transform: translateX(-50%);
diff --git a/app/assets/stylesheets/tooltips.css b/app/assets/stylesheets/tooltips.css
index 419664fc6..f6ff54ffc 100644
--- a/app/assets/stylesheets/tooltips.css
+++ b/app/assets/stylesheets/tooltips.css
@@ -10,7 +10,7 @@
       font-size: var(--text-x-small);
       font-weight: normal;
       inset: -1ch auto auto 50%;
-      max-inline-size: 50ch;
+      max-inline-size: min(50ch, calc(100vw - (var(--inline-space) * 2)));
       opacity: 0;
       padding: 0.25ch 1ch;
       transition: var(--tooltip-duration) ease-out allow-discrete;