diff --git a/common/locale/en-US/buffer.xml b/common/locale/en-US/buffer.xml
index fdb397d8..e3721d96 100644
--- a/common/locale/en-US/buffer.xml
+++ b/common/locale/en-US/buffer.xml
@@ -540,7 +540,7 @@
 </item>
 
 <item>
-    <tags>&lt;yank-word> Y</tags>
+    <tags>&lt;yank-selection> Y</tags>
     <spec>Y</spec>
     <description short="true">
         <p>Copy currently selected text to the system clipboard.</p>
diff --git a/common/modules/buffer.jsm b/common/modules/buffer.jsm
index 750703cc..94408494 100644
--- a/common/modules/buffer.jsm
+++ b/common/modules/buffer.jsm
@@ -2099,7 +2099,7 @@ var Buffer = Module("Buffer", {
             function () { tabs.reload(tabs.getTab(), true); });
 
         // yanking
-        mappings.add([modes.NORMAL], ["Y", "<yank-word>"],
+        mappings.add([modes.NORMAL], ["Y", "<yank-selection>"],
             "Copy selected text or current word",
             function () {
                 let sel = buffer.currentWord;