diff --git a/addon/components/category-nav.hbs b/addon/components/category-nav.hbs
index 94804f6c..889ba762 100644
--- a/addon/components/category-nav.hbs
+++ b/addon/components/category-nav.hbs
@@ -22,7 +22,7 @@
         />
       {{/each}}
     {{else}}
-      {{#each this.categories.records as |category|}}
+      {{#each (sort-by "sort" this.categories.records) as |category|}}
         <CategoryNav::Category
           @category={{category}}
           @selected={{@selected}}
diff --git a/addon/models/category.js b/addon/models/category.js
index 012c5bb0..a9fd2aa0 100644
--- a/addon/models/category.js
+++ b/addon/models/category.js
@@ -7,6 +7,7 @@ export default class CategoryModel extends LocalizedModel {
   @attr color;
   @attr metainfo;
   @attr allowedMimeTypes;
+  @attr sort;
 
   @belongsTo("category", { inverse: "children", async: true }) parent;
   @hasMany("category", { inverse: "parent", async: true }) children;