diff --git a/CHANGELOG b/CHANGELOG
index 389f88f27b1..e1145f36ce3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -142,6 +142,7 @@ v 8.10.0 (unreleased)
   - Fix issues importing projects from EE to CE
   - Fix creating group with space in group path
   - Improve cron_jobs loading error messages !5318 / !5360
+  - Prevent toggling sidebar when clipboard icon clicked
   - Create Todos for Issue author when assign or mention himself (Katarzyna Kobierska)
   - Limit the number of retries on error to 3 for exporting projects
   - Allow empty repositories on project import/export
diff --git a/app/assets/javascripts/right_sidebar.js.coffee b/app/assets/javascripts/right_sidebar.js.coffee
index 12340bbce54..0c95301e380 100644
--- a/app/assets/javascripts/right_sidebar.js.coffee
+++ b/app/assets/javascripts/right_sidebar.js.coffee
@@ -120,6 +120,9 @@ class @Sidebar
       i.show()
 
   sidebarCollapseClicked: (e) ->
+
+    return if $(e.currentTarget).hasClass('dont-change-state')
+
     sidebar = e.data
     e.preventDefault()
     $block = $(@).closest('.block')
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index e020a7d4d00..8e2fcbdfab8 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -156,7 +156,7 @@
 
       - project_ref = cross_project_reference(@project, issuable)
       .block.project-reference
-        .sidebar-collapsed-icon
+        .sidebar-collapsed-icon.dont-change-state
           = clipboard_button(clipboard_text: project_ref)
         .cross-project-reference.hide-collapsed
           %span