diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 2802a4eca7bc5c38477e0cbb0d9fe7269a8995af..82e0d0025ec381b30146627bf3906258fca17ef9 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -31,7 +31,7 @@
               = f.select(:default_branch, @project.repository.branch_names, {}, {class: 'select2 select-wide'})
         .form-group
           = f.label :tag_list, "Tags", class: 'label-light'
-          = f.text_field :tag_list, value: @project.tag_list.to_s, maxlength: 2000, class: "form-control"
+          = f.text_field :tag_list, value: @project.tag_list.sort.join(', '), maxlength: 2000, class: "form-control"
           %p.help-block Separate tags with commas.
         %hr
         %fieldset