diff --git a/app/assets/stylesheets/nav.css b/app/assets/stylesheets/nav.css
index bcbe83088..8d9b2e5c1 100644
--- a/app/assets/stylesheets/nav.css
+++ b/app/assets/stylesheets/nav.css
@@ -178,6 +178,7 @@
       aspect-ratio: 5/3;
       background-color: var(--color-ink-lightest);
       border-radius: 0.5em;
+      container-type: inline-size;
       flex-basis: calc((100% - var(--gap) * 2) / 3);
       flex-direction: column;
       font-size: var(--text-small);
@@ -212,6 +213,7 @@
 
       @media (max-width: 639px) {
         font-size: var(--text-x-small);
+        font-size: clamp(var(--text-xx-small), 3.15cqi, var(--text-small));
         font-weight: 500;
       }
     }
diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index 06add9439..0213d04cb 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -10,8 +10,8 @@
 
     inset: 0 auto auto 50%;
     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)));
+    max-inline-size: min(55ch, calc(100vw - (var(--panel-padding))));
+    min-inline-size: min(25ch, calc(100vw - (var(--panel-padding))));
     overflow: auto;
     position: absolute;
     transform: translateX(-50%);