diff --git a/app/views/projects/_issuable_form.html.haml b/app/views/projects/_issuable_form.html.haml
index 316b71f6be7ddb7ead3e88174258d62753b9c263..114470f1db4e5b16e1fed5683eae2dc6432e16ba 100644
--- a/app/views/projects/_issuable_form.html.haml
+++ b/app/views/projects/_issuable_form.html.haml
@@ -49,14 +49,20 @@
       - else
         %span.light No open milestones available.
        
-      = link_to 'Create new milestone', new_project_milestone_path
+      = link_to 'Create new milestone', new_project_milestone_path(issuable.project)
 .form-group
   = f.label :label_ids, class: 'control-label' do
     %i.icon-tag
     Labels
   .col-sm-10
-    = f.collection_select :label_ids, issuable.project.labels.all, :id, :name,
+    - if issuable.project.labels.any?
+      = f.collection_select :label_ids, issuable.project.labels.all, :id, :name,
         { selected: issuable.label_ids }, multiple: true, class: 'select2'
+    - else
+      %span.light No labels yet.
+     
+    = link_to 'Create new label', new_project_label_path(issuable.project)
+
 .form-actions
   - if issuable.new_record?
     = f.submit "Submit new #{issuable.class.model_name.human.downcase}", class: 'btn btn-create'