diff --git a/app/components/form/element.hbs b/app/components/form/element.hbs
index 754e6fb..c156a55 100644
--- a/app/components/form/element.hbs
+++ b/app/components/form/element.hbs
@@ -1,4 +1,4 @@
-<div class='mb-4 max-w-lg'>
+<div class='mb-4 max-w-lg' ...attributes>
   {{#if @label}}
     <label
       for={{@for}}
diff --git a/app/components/form/input.hbs b/app/components/form/input.hbs
index c24aed2..c9cb778 100644
--- a/app/components/form/input.hbs
+++ b/app/components/form/input.hbs
@@ -3,6 +3,7 @@
   @for={{this.id}}
   @required={{@required}}
   @helper={{@helper}}
+  ...attributes
 >
   <div class='relative flex items-center border rounded'>
     {{#if @prefixIcon}}
diff --git a/app/templates/admin/indexes/item/documents/index.hbs b/app/templates/admin/indexes/item/documents/index.hbs
index 17bae23..8194c41 100644
--- a/app/templates/admin/indexes/item/documents/index.hbs
+++ b/app/templates/admin/indexes/item/documents/index.hbs
@@ -6,19 +6,20 @@
   Create new document
 </LinkTo>
 
-<div class='sm:flex'>
+<div class='sm:flex sm:flex-nowrap'>
   <Form::Input
     @placeholder='Search'
     @prefixIcon={{this.Magnify}}
     @value={{this.q}}
     @onChange={{this.searchTextChanged}}
+    class="sm:grow"
   />
 
   {{#if this.sortValues.length}}
-    <div class='relative mb-4 sm:ml-4'>
+    <div class='relative mb-4 sm:ml-auto sm:flex-none'>
       <Listbox @value={{this.sort}} @onChange={{set this 'sort'}} as |listbox|>
         <listbox.Button
-          class='inline-flex items-center justify-center min-w-min w-24 px-3 py-2 border rounded cursor-pointer'
+          class='inline-flex items-center px-3 py-2 border rounded cursor-pointer'
         >
           <Icons::Sort class='mr-1' />
           {{if this.sort this.sort 'Sort'}}
@@ -51,7 +52,7 @@
     </div>
   {{/if}}
 
-  <div class='relative mb-4 sm:ml-4'>
+  <div class='relative mb-4 sm:ml-4 sm:flex-none'>
     <Menu as |menu|>
       <menu.Button as |menuButton|>
         <Button @style='link' @onClick={{menuButton.toggleMenu}} class='w-auto'>