diff --git a/src/css/epicker-ui.css b/src/css/epicker-ui.css
index 68f33ad1b..e45b935dd 100644
--- a/src/css/epicker-ui.css
+++ b/src/css/epicker-ui.css
@@ -14,12 +14,13 @@ html#ublock0-epicker,
 }
 #ublock0-epicker aside {
     background-color: var(--default-surface);
-    border: 1px solid #aaa;
+    border: 1px solid var(--default-surface-border);
     bottom: 4px;
     box-sizing: border-box;
     cursor: default;
     display: none;
-    min-width: 24em;
+    max-width: 36rem;
+    min-width: 24rem;
     padding: 4px;
     position: fixed;
     right: 4px;
diff --git a/src/css/themes/default.css b/src/css/themes/default.css
index c0eb56789..8ba229500 100644
--- a/src/css/themes/default.css
+++ b/src/css/themes/default.css
@@ -78,6 +78,7 @@
     --default-ink-a4: var(--ink-80-a4);
     --default-ink-a50: var(--ink-80-a50);
     --default-surface: var(--light-gray-10);
+    --default-surface-border: var(--light-gray-70);
     --default-surface-hover: var(--light-gray-30-a50);
 
     --bg-1: hsla(240, 20%, 98%, 1);