diff --git a/app/controllers/admin/indexes/item/documents/index.js b/app/controllers/admin/indexes/item/documents/index.js
index 474bd85..be89251 100644
--- a/app/controllers/admin/indexes/item/documents/index.js
+++ b/app/controllers/admin/indexes/item/documents/index.js
@@ -28,26 +28,36 @@ export default class AdminIndexesItemDocumentsIndexController extends Controller
     return this.model.data.offset + this.model.data.hits.length;
   }
 
-  get sortedFields() {
-    const fields = Object.keys(this.model.stats.fieldDistribution);
-    const primaryKey = this.model.index.primaryKey ?? 'id';
-    const sortedArray = fields
-      .filter((item) => item !== primaryKey)
-      .sort((a, b) => {
-        if (a > b || a.charAt(0) === '_') {
-          return 1;
-        }
+  get sortValues() {
+    const result = [];
 
-        if (a < b) {
-          return -1;
-        }
+    this.model.sortableAttributes.forEach((item) => {
+      result.push(`${item}:asc`, `${item}:desc`);
+    });
 
-        return 0;
-      });
-
-    return [primaryKey].concat(sortedArray);
+    return result;
   }
 
+  // get sortedFields() {
+  //   const fields = Object.keys(this.model.stats.fieldDistribution);
+  //   const primaryKey = this.model.index.primaryKey ?? 'id';
+  //   const sortedArray = fields
+  //     .filter((item) => item !== primaryKey)
+  //     .sort((a, b) => {
+  //       if (a > b || a.charAt(0) === '_') {
+  //         return 1;
+  //       }
+
+  //       if (a < b) {
+  //         return -1;
+  //       }
+
+  //       return 0;
+  //     });
+
+  //   return [primaryKey].concat(sortedArray);
+  // }
+
   @action
   searchTextChanged(value) {
     this.q = value === '' ? null : value;
diff --git a/app/templates/admin/indexes/item/documents/index.hbs b/app/templates/admin/indexes/item/documents/index.hbs
index afb7214..166f09a 100644
--- a/app/templates/admin/indexes/item/documents/index.hbs
+++ b/app/templates/admin/indexes/item/documents/index.hbs
@@ -1,9 +1,43 @@
-<Form::Input
-  @placeholder='Search'
-  @prefixIcon={{this.Magnify}}
-  @value={{this.q}}
-  @onChange={{this.searchTextChanged}}
-/>
+<LinkTo
+  @route='admin.indexes.item.documents.new'
+  @model={{@model.index}}
+  class='block mb-4'
+>
+  Create new document
+</LinkTo>
+
+<div class='sm:flex mb-4'>
+  <Form::Input
+    @placeholder='Search'
+    @prefixIcon={{this.Magnify}}
+    @value={{this.q}}
+    @onChange={{this.searchTextChanged}}
+  />
+  <div class='inline relative sm:ml-4'>
+    <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'
+      >
+        <Icons::Sort class='mr-1' />
+        {{if this.sort this.sort 'Sort'}}
+      </listbox.Button>
+      <listbox.Options
+        class='absolute z-dropdown right-0 w-28 min-w-min mt-2 py-1 origin-top-right bg-base-7 border rounded shadow-sm outline-none'
+        as |options|
+      >
+        {{#each this.sortValues as |item|}}
+          <options.Option @value={{item}} class='outline-none'>
+            <div
+              class='flex items-center px-4 py-2 text-sm hover:bg-base-6 hover:text-base-1 cursor-pointer'
+            >
+              {{item}}
+            </div>
+          </options.Option>
+        {{/each}}
+      </listbox.Options>
+    </Listbox>
+  </div>
+</div>
 
 {{!-- <div class='flex items-center mb-4'>
   <div class='flex items-center ml-auto'>
@@ -17,14 +51,6 @@
   </div>
 </div> --}}
 
-<LinkTo
-  @route='admin.indexes.item.documents.new'
-  @model={{@model.index}}
-  class='block mb-4'
->
-  Create new document
-</LinkTo>
-
 {{#if (gt @model.data.estimatedTotalHits 0)}}
   <RoyalTable
     @data={{@model.data.hits}}