diff --git a/app/controllers/context_menus_controller.rb b/app/controllers/context_menus_controller.rb
index e9ff824f5..321219413 100644
--- a/app/controllers/context_menus_controller.rb
+++ b/app/controllers/context_menus_controller.rb
@@ -36,7 +36,8 @@ class ContextMenusController < ApplicationController
       :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
       :copy => User.current.allowed_to?(:copy_issues, @projects) && Issue.allowed_target_projects.any?,
       :add_watchers => User.current.allowed_to?(:add_issue_watchers, @projects),
-      :delete => @issues.all?(&:deletable?)
+      :delete => @issues.all?(&:deletable?),
+      :add_subtask => (@project && User.current.allowed_to?(:manage_subtasks, @project))
     }
 
     @assignables = @issues.map(&:assignable_users).reduce(:&)
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index b04ec5fb0..38838087d 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -233,11 +233,18 @@ module IssuesHelper
 
   # Returns a link for adding a new subtask to the given issue
   def link_to_new_subtask(issue)
+    link_to(l(:button_add), url_for_new_subtask(issue))
+  end
+
+  def url_for_new_subtask(issue)
     attrs = {
       :parent_issue_id => issue
     }
     attrs[:tracker_id] = issue.tracker unless issue.tracker.disabled_core_fields.include?('parent_issue_id')
-    link_to(l(:button_add), new_project_issue_path(issue.project, :issue => attrs, :back_url => issue_path(issue)))
+    params = {}
+    params[:issue] = attrs
+    params[:back_url] = issue_path(issue) if controller_name == 'issues' && action_name == 'show'
+    new_project_issue_path(issue.project, params)
   end
 
   def trackers_options_for_select(issue)
diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb
index eef2bdea2..3a8e19cdd 100644
--- a/app/views/context_menus/issues.html.erb
+++ b/app/views/context_menus/issues.html.erb
@@ -151,6 +151,10 @@
   <li><%= context_menu_link l(:button_log_time), new_issue_time_entry_path(@issue),
           :class => 'icon icon-time-add' %></li>
   <% end %>
+  <% if @can[:add_subtask] -%>
+  <li><%= context_menu_link l(:button_add_subtask), url_for_new_subtask(@issue),
+          :class => 'icon icon-add' %></li>
+  <% end %>
   <li><%= context_menu_link l(:button_copy), project_copy_issue_path(@project, @issue),
           :class => 'icon icon-copy', :disabled => !@can[:copy] %></li>
 <% else %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dce5bda76..8adea7a48 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1160,6 +1160,7 @@ en:
   button_project_bookmark_delete: Remove bookmark
   button_filter: Filter
   button_actions: Actions
+  button_add_subtask: Add subtask
 
   status_active: active
   status_registered: registered