diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index f1f279170..5048a0332 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -39,8 +39,8 @@
         <%= l(:label_updated_time, time_tag(@issue.updated_on)).html_safe %>.
         <% end %>
         </p>
-
-<div class="attributes">
+<%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
+<div class="attributes hascontextmenu">
 <%= issue_fields_rows do |rows|
   rows.left l(:field_status), @issue.status.name, :class => 'status'
   rows.left l(:field_priority), @issue.priority.name, :class => 'priority'
@@ -73,8 +73,9 @@
 end %>
 <%= render_half_width_custom_fields_rows(@issue) %>
 <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
+<%= check_box_tag 'ids[]', @issue.id, false, :style => 'display:none;', :id => nil %>
 </div>
-
+<% end %>
 <% if @issue.description? || @issue.attachments.any? -%>
 <hr />
 <% if @issue.description? %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index f70358b43..d9eaa201a 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -467,7 +467,7 @@ div.issue div.subject h3 {margin: 0; margin-bottom: 0.1em;}
 div.issue p.author {margin-top:0.5em;}
 div.issue span.private, div.journal span.private { position:relative; bottom: 2px; text-transform: uppercase; background: #d22; color: #fff; font-weight:bold; padding: 0px 2px 0px 2px; font-size: 60%; margin-right: 2px; border-radius: 2px;}
 div.issue .next-prev-links {color:#999;}
-div.issue .attributes {margin-top: 2em;}
+div.issue .attributes {margin-top: 2em; margin-left: -5px; margin-right: -5px; padding: 5px;}
 div.issue .attributes .attribute {padding-left:180px; clear:left; min-height: 1.8em;}
 div.issue .attributes .attribute .label {width: 170px; margin-left:-180px; font-weight:bold; float:left;  overflow:hidden; text-overflow: ellipsis;}
 div.issue .attribute .value {overflow:auto; text-overflow: ellipsis;}
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index c423d6de3..3bc590daf 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1589,12 +1589,25 @@ class IssuesControllerTest < Redmine::ControllerTest
       assert_select 'fieldset' do
         assert_select 'legend', :text => 'Log time'
         assert_select 'input[name=?]', 'time_entry[hours]'
-      end
-      assert_select 'fieldset' do
-        assert_select 'legend', :text => 'Notes'
-        assert_select 'textarea[name=?]', 'issue[notes]'
-      end
-    end
+	  end
+	  assert_select 'fieldset' do
+		assert_select 'legend', :text => 'Notes'
+		assert_select 'textarea[name=?]', 'issue[notes]'
+	  end
+	end
+  end
+
+  def test_show_issue_attributes_should_provide_contextmenu
+	@request.session[:user_id] = 2
+	get :show, :params => {
+	  :id => 1
+	}
+
+	# assert context menu on issues
+	assert_select 'form[data-cm-url=?]', '/issues/context_menu'
+	assert_select 'div.attributes.hascontextmenu' do
+	  assert_select 'input[name=?][type=?]', 'ids[]', 'checkbox'
+	end
   end
 
   def test_show_should_display_update_form