diff --git a/common/content/buffer.js b/common/content/buffer.js
index 2f973b86..ced26b1f 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -440,7 +440,7 @@ const Buffer = Module("buffer", {
     },
 
     /**
-     * Returns the current selection. If the selection is
+     * Returns the currently selected word. If the selection is
      * null, it tries to guess the word that the caret is
      * positioned in.
      *
@@ -450,9 +450,7 @@ const Buffer = Module("buffer", {
      */
     // FIXME: getSelection() doesn't always preserve line endings, see:
     // https://www.mozdev.org/bugs/show_bug.cgi?id=19303
-    // FIXME: The ABRACADABRA nature of this function has always seemed bizarre
-    // to me. Who's with me? --djk
-    get currentWord() {
+    getCurrentWord: function () {
         let win = tabs.localStore.focusedFrame || content;
         let selection = win.getSelection();
         if (selection.rangeCount == 0)
@@ -1570,7 +1568,7 @@ const Buffer = Module("buffer", {
         mappings.add(myModes, ["Y"],
             "Copy selected text or current word",
             function () {
-                let sel = buffer.currentWord;
+                let sel = buffer.getCurrentWord();
                 dactyl.assert(sel);
                 dactyl.clipboardWrite(sel, true);
             });
diff --git a/common/content/editor.js b/common/content/editor.js
index 722a5385..03091813 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -664,7 +664,7 @@ const Editor = Module("editor", {
                     modes.set(modes.TEXTAREA);
                 }
                 else
-                    dactyl.clipboardWrite(buffer.currentWord, true);
+                    dactyl.clipboardWrite(buffer.getCurrentWord(), true);
             });
 
         mappings.add([modes.VISUAL, modes.TEXTAREA],
diff --git a/common/content/finder.js b/common/content/finder.js
index 9c1354e5..485bc0bd 100644
--- a/common/content/finder.js
+++ b/common/content/finder.js
@@ -195,14 +195,14 @@ const RangeFinder = Module("rangefinder", {
             "Find word under cursor",
             function () {
                 rangefinder._found = false;
-                rangefinder.onSubmit(buffer.currentWord, false);
+                rangefinder.onSubmit(buffer.getCurrentWord(), false);
             });
 
         mappings.add(myModes.concat([modes.CARET, modes.TEXTAREA]), ["#"],
             "Find word under cursor backwards",
             function () {
                 rangefinder._found = false;
-                rangefinder.onSubmit(buffer.currentWord, true);
+                rangefinder.onSubmit(buffer.getCurrentWord(), true);
             });
 
     },