diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index 47e544acf5293d1e9ee00b9cdc58973d6cd6395c..43883a18fa95c24a2bff369bfd7ec27717ab7126 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -20,6 +20,7 @@
             Next
 
     = form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f|
+      - can_edit_assignee = can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
       .block.assignee
         .sidebar-collapsed-icon.sidebar-collapsed-user{data: {toggle: "tooltip", placement: "left", container: "body"}, title: (issuable.assignee.to_reference if issuable.assignee)}
           - if issuable.assignee
@@ -29,9 +30,9 @@
         .title.hide-collapsed
           Assignee
           = icon('spinner spin', class: 'block-loading')
-          - if can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
+          - if can_edit_assignee
             = link_to 'Edit', '#', class: 'edit-link pull-right'
-        .value.bold.hide-collapsed
+        .value.bold.hide-collapsed{data: {can_edit_assign: can_edit_assignee}}
           - if issuable.assignee
             = link_to_member(@project, issuable.assignee, size: 32) do
               - if issuable.instance_of?(MergeRequest) && !issuable.can_be_merged_by?(issuable.assignee)
@@ -41,9 +42,10 @@
                 = issuable.assignee.to_reference
           - else
             %span.assign-yourself
-              No assignee -
-              %a.js-assign-yourself{ href: '#' }
-                assign yourself
+              No assignee
+              - if can_edit_assignee
+                %a.js-assign-yourself{ href: '#' }
+                  \- assign yourself
 
         .selectbox.hide-collapsed
           = f.hidden_field 'assignee_id', value: issuable.assignee_id, id: 'issue_assignee_id'