diff --git a/web/src/popover_menus.js b/web/src/popover_menus.js
index 9b27ad86f0..a6c3140e72 100644
--- a/web/src/popover_menus.js
+++ b/web/src/popover_menus.js
@@ -41,6 +41,10 @@ export function popover_items_handle_keyboard(key, $items) {
     let index = $items.index($items.filter(":focus"));
 
     if (key === "enter" && index >= 0 && index < $items.length) {
+        // This is not enough for some elements which need to trigger
+        // natural click for them to work like ClipboardJS and follow
+        // the link for anchor tags. For those elements, we need to
+        // use `.navigate-link-on-enter` class on them.
         $items.eq(index).trigger("click");
         return;
     }
diff --git a/web/templates/popovers/actions_popover.hbs b/web/templates/popovers/actions_popover.hbs
index ee5e319444..e71936303c 100644
--- a/web/templates/popovers/actions_popover.hbs
+++ b/web/templates/popovers/actions_popover.hbs
@@ -110,7 +110,7 @@
     {{/if}}
 
     <li>
-        <a class="copy_link" data-message-id="{{message_id}}" data-clipboard-text="{{ conversation_time_url }}" tabindex="0">
+        <a class="copy_link navigate-link-on-enter" data-message-id="{{message_id}}" data-clipboard-text="{{ conversation_time_url }}" tabindex="0">
             <i class="fa fa-link" aria-hidden="true"></i> {{t "Copy link to message" }}
         </a>
     </li>