diff --git a/packages/canon/css/components.css b/packages/canon/css/components.css
index cd0809dadb..3ef8175c46 100644
--- a/packages/canon/css/components.css
+++ b/packages/canon/css/components.css
@@ -683,7 +683,6 @@
 }
 
 .canon-MenuPopup {
-  padding: var(--canon-space-1) 0;
   background-color: var(--canon-bg-surface-1);
   border: 1px solid var(--canon-border);
   color: var(--canon-fg-primary);
@@ -695,6 +694,7 @@
   flex-direction: column;
   transition: transform .15s, opacity .15s;
   display: flex;
+  position: relative;
   overflow: auto;
 
   &[data-starting-style], &[data-ending-style] {
@@ -715,9 +715,18 @@
   font-size: var(--canon-font-size-3);
   cursor: pointer;
   outline: 0;
+  flex-shrink: 0;
   text-decoration: none;
   display: flex;
 
+  &:first-child {
+    margin-top: var(--canon-space-1);
+  }
+
+  &:last-child {
+    margin-bottom: var(--canon-space-1);
+  }
+
   &[data-highlighted] {
     background-color: var(--canon-gray-3);
   }
@@ -736,6 +745,7 @@
   font-size: var(--canon-font-size-3);
   cursor: pointer;
   outline: 0;
+  flex-shrink: 0;
   text-decoration: none;
   display: flex;
 
@@ -759,22 +769,23 @@
 }
 
 .canon-SubmenuComboboxSearch {
-  padding: var(--canon-space-2) var(--canon-space-5);
+  padding-inline: var(--canon-space-3);
   border: none;
   border-bottom: 1px solid var(--canon-border);
   background-color: var(--canon-bg-surface-1);
+  height: 32px;
   color: var(--canon-fg-primary);
-  outline: none;
   line-height: 140%;
+  font-size: var(--canon-font-size-3);
+  z-index: 1;
+  outline: none;
+  position: sticky;
+  top: 0;
 
   &::placeholder {
     color: var(--canon-fg-secondary);
   }
 
-  &:focus {
-    border-color: var(--canon-border-hover);
-  }
-
   &:disabled {
     opacity: .6;
     cursor: not-allowed;
@@ -790,8 +801,9 @@
 }
 
 .canon-SubmenuComboboxNoResults {
-  padding: var(--canon-space-3);
-  padding-left: var(--canon-space-5);
+  padding-inline: var(--canon-space-3);
+  padding-top: var(--canon-space-2);
+  padding-bottom: var(--canon-space-4);
   color: var(--canon-fg-secondary);
   font-size: var(--canon-font-size-3);
 }
@@ -809,6 +821,7 @@
   font-size: var(--canon-font-size-3);
   cursor: pointer;
   outline: 0;
+  flex-shrink: 0;
   text-decoration: none;
   display: flex;
 
diff --git a/packages/canon/css/menu.css b/packages/canon/css/menu.css
index d901273cb3..7671217198 100644
--- a/packages/canon/css/menu.css
+++ b/packages/canon/css/menu.css
@@ -3,7 +3,6 @@
 }
 
 .canon-MenuPopup {
-  padding: var(--canon-space-1) 0;
   background-color: var(--canon-bg-surface-1);
   border: 1px solid var(--canon-border);
   color: var(--canon-fg-primary);
@@ -15,6 +14,7 @@
   flex-direction: column;
   transition: transform .15s, opacity .15s;
   display: flex;
+  position: relative;
   overflow: auto;
 
   &[data-starting-style], &[data-ending-style] {
@@ -35,9 +35,18 @@
   font-size: var(--canon-font-size-3);
   cursor: pointer;
   outline: 0;
+  flex-shrink: 0;
   text-decoration: none;
   display: flex;
 
+  &:first-child {
+    margin-top: var(--canon-space-1);
+  }
+
+  &:last-child {
+    margin-bottom: var(--canon-space-1);
+  }
+
   &[data-highlighted] {
     background-color: var(--canon-gray-3);
   }
@@ -56,6 +65,7 @@
   font-size: var(--canon-font-size-3);
   cursor: pointer;
   outline: 0;
+  flex-shrink: 0;
   text-decoration: none;
   display: flex;
 
@@ -79,22 +89,23 @@
 }
 
 .canon-SubmenuComboboxSearch {
-  padding: var(--canon-space-2) var(--canon-space-5);
+  padding-inline: var(--canon-space-3);
   border: none;
   border-bottom: 1px solid var(--canon-border);
   background-color: var(--canon-bg-surface-1);
+  height: 32px;
   color: var(--canon-fg-primary);
-  outline: none;
   line-height: 140%;
+  font-size: var(--canon-font-size-3);
+  z-index: 1;
+  outline: none;
+  position: sticky;
+  top: 0;
 
   &::placeholder {
     color: var(--canon-fg-secondary);
   }
 
-  &:focus {
-    border-color: var(--canon-border-hover);
-  }
-
   &:disabled {
     opacity: .6;
     cursor: not-allowed;
@@ -110,8 +121,9 @@
 }
 
 .canon-SubmenuComboboxNoResults {
-  padding: var(--canon-space-3);
-  padding-left: var(--canon-space-5);
+  padding-inline: var(--canon-space-3);
+  padding-top: var(--canon-space-2);
+  padding-bottom: var(--canon-space-4);
   color: var(--canon-fg-secondary);
   font-size: var(--canon-font-size-3);
 }
@@ -129,6 +141,7 @@
   font-size: var(--canon-font-size-3);
   cursor: pointer;
   outline: 0;
+  flex-shrink: 0;
   text-decoration: none;
   display: flex;
 
diff --git a/packages/canon/css/styles.css b/packages/canon/css/styles.css
index 08aaa80970..07bac6155c 100644
--- a/packages/canon/css/styles.css
+++ b/packages/canon/css/styles.css
@@ -9907,7 +9907,6 @@
 }
 
 .canon-MenuPopup {
-  padding: var(--canon-space-1) 0;
   background-color: var(--canon-bg-surface-1);
   border: 1px solid var(--canon-border);
   color: var(--canon-fg-primary);
@@ -9919,6 +9918,7 @@
   flex-direction: column;
   transition: transform .15s, opacity .15s;
   display: flex;
+  position: relative;
   overflow: auto;
 
   &[data-starting-style], &[data-ending-style] {
@@ -9939,9 +9939,18 @@
   font-size: var(--canon-font-size-3);
   cursor: pointer;
   outline: 0;
+  flex-shrink: 0;
   text-decoration: none;
   display: flex;
 
+  &:first-child {
+    margin-top: var(--canon-space-1);
+  }
+
+  &:last-child {
+    margin-bottom: var(--canon-space-1);
+  }
+
   &[data-highlighted] {
     background-color: var(--canon-gray-3);
   }
@@ -9960,6 +9969,7 @@
   font-size: var(--canon-font-size-3);
   cursor: pointer;
   outline: 0;
+  flex-shrink: 0;
   text-decoration: none;
   display: flex;
 
@@ -9983,22 +9993,23 @@
 }
 
 .canon-SubmenuComboboxSearch {
-  padding: var(--canon-space-2) var(--canon-space-5);
+  padding-inline: var(--canon-space-3);
   border: none;
   border-bottom: 1px solid var(--canon-border);
   background-color: var(--canon-bg-surface-1);
+  height: 32px;
   color: var(--canon-fg-primary);
-  outline: none;
   line-height: 140%;
+  font-size: var(--canon-font-size-3);
+  z-index: 1;
+  outline: none;
+  position: sticky;
+  top: 0;
 
   &::placeholder {
     color: var(--canon-fg-secondary);
   }
 
-  &:focus {
-    border-color: var(--canon-border-hover);
-  }
-
   &:disabled {
     opacity: .6;
     cursor: not-allowed;
@@ -10014,8 +10025,9 @@
 }
 
 .canon-SubmenuComboboxNoResults {
-  padding: var(--canon-space-3);
-  padding-left: var(--canon-space-5);
+  padding-inline: var(--canon-space-3);
+  padding-top: var(--canon-space-2);
+  padding-bottom: var(--canon-space-4);
   color: var(--canon-fg-secondary);
   font-size: var(--canon-font-size-3);
 }
@@ -10033,6 +10045,7 @@
   font-size: var(--canon-font-size-3);
   cursor: pointer;
   outline: 0;
+  flex-shrink: 0;
   text-decoration: none;
   display: flex;