diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index 202bf327217..e220d6a3185 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -33,6 +33,8 @@
       .controls
         - if type == 'text'
           = f.text_field name, class: "input-xlarge", placeholder: placeholder
+        - elsif type == 'textarea'
+          = f.textarea name, rows: 5
         - elsif type == 'checkbox'
           = f.check_box name
 
diff --git a/app/views/projects/services/index.html.haml b/app/views/projects/services/index.html.haml
index 190aa69dab7..9543d97b7f7 100644
--- a/app/views/projects/services/index.html.haml
+++ b/app/views/projects/services/index.html.haml
@@ -3,7 +3,7 @@
 %hr
 
 %ul.bordered-list
-  - @services.each do |service|
+  - @services.sort_by(&:title).each do |service|
     %li
       %h4
         = link_to edit_project_service_path(@project, service.to_param) do