diff --git a/src/css/basecoat.css b/src/css/basecoat.css
index 20f23dc..4752b35 100644
--- a/src/css/basecoat.css
+++ b/src/css/basecoat.css
@@ -742,14 +742,14 @@
 
 /* Input */
 @layer components {
-  :is(.form, .field) input[type='text'],
+  :is(.form, .field) input[type='text']:not(:is(.select [data-popover] > header input[role='combobox'], .command > header input, .dialog > * > header input)),
   :is(.form, .field) input[type='email'],
   :is(.form, .field) input[type='password'],
   :is(.form, .field) input[type='number'],
   :is(.form, .field) input[type='file'],
   :is(.form, .field) input[type='tel'],
   :is(.form, .field) input[type='url'],
-  :is(.form, .field) input[type='search'],
+  :is(.form, .field) input[type='search']:not(:is(.select [data-popover] > header input[role='combobox'], .command > header input, .dialog > * > header input)),
   :is(.form, .field) input[type='date'],
   :is(.form, .field) input[type='datetime-local'],
   :is(.form, .field) input[type='month'],
@@ -797,7 +797,7 @@
 /* Popover */
 @layer components {
   [data-popover] {
-    @apply absolute bg-popover text-popover-foreground overflow-x-hidden overflow-y-auto rounded-md border shadow-md z-50 visible opacity-100 scale-100 min-w-full w-max transition-all;
+    @apply absolute bg-popover text-popover-foreground overflow-x-hidden overflow-y-auto rounded-md border shadow-md z-50 visible opacity-100 scale-100 min-w-full w-fit transition-all;
 
     &[aria-hidden='true'] {
       @apply invisible opacity-0 scale-95;
@@ -1299,4 +1299,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/jinja/command.html.jinja b/src/jinja/command.html.jinja
index ea61d0d..d46d84f 100644
--- a/src/jinja/command.html.jinja
+++ b/src/jinja/command.html.jinja
@@ -164,7 +164,7 @@
         {% endif %}
       >
         <span role="heading" id="{{ group_label_id }}">{{ item.label | safe }}</span>
-        {{ render_command_items(item.items, item_id) if item.items }}
+        {{ render_command_items(item['items'], item_id) if item['items'] }}
       </div>
     {% elif item.type == "separator" %}
       <hr role="separator" />
diff --git a/src/jinja/dropdown-menu.html.jinja b/src/jinja/dropdown-menu.html.jinja
index a3f4901..09d831a 100644
--- a/src/jinja/dropdown-menu.html.jinja
+++ b/src/jinja/dropdown-menu.html.jinja
@@ -86,7 +86,7 @@
         {% endif %}
       >
         <div role="heading" id="{{ group_label_id }}">{{ item.label }}</div>
-        {{ render_dropdown_items(item.items, item_id) if item.items }}
+        {{ render_dropdown_items(item['items'], item_id) if item['items'] }}
       </div>
     {% elif item.type == "separator" %}
       <hr role="separator" />
diff --git a/src/jinja/select.html.jinja b/src/jinja/select.html.jinja
index c1f54a6..1371257 100644
--- a/src/jinja/select.html.jinja
+++ b/src/jinja/select.html.jinja
@@ -33,7 +33,7 @@
 {% if items %}
   {% for item in items %}
     {% if item.type == "group" %}
-      {% for sub_item in item.items %}
+      {% for sub_item in item['items'] %}
         {% if not first_option.item %}
           {% set first_option.item = sub_item %}
         {% endif %}
@@ -153,7 +153,7 @@
         {% endif %}
       >
         <div role="heading" id="{{ group_label_id }}">{{ item.label }}</div>
-        {{ render_select_items(item.items, selected, item_id) if item.items }}
+        {{ render_select_items(item['items'], selected, item_id) if item['items'] }}
       </div>
     {% elif item.type == "separator" %}
       <hr role="separator" />
@@ -173,4 +173,4 @@
       </div>
     {% endif %}
   {% endfor %}
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}