diff --git a/common/content/buffer.js b/common/content/buffer.js
index ef47115e..7b2d20e1 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -331,21 +331,8 @@ var Buffer = Module("buffer", {
      *
      * @returns {string}
      */
-    getCurrentWord: function (win) {
-        let selection = win.getSelection();
-        if (selection.rangeCount == 0)
-            return "";
-
-        let range = selection.getRangeAt(0).cloneRange();
-        if (range.collapsed) {
-            let re = options.get("iskeyword").regexp;
-            Editor.extendRange(range, true,  re, true);
-            Editor.extendRange(range, false, re, true);
-        }
-        return util.domToString(range);
-    },
-
-    get currentWord() this.getCurrentWord(this.focusedFrame),
+    get currentWord() Buffer.currentWord(this.focusedFrame),
+    getCurrentWord: deprecated("buffer.currentWord", function getCurrentWord() this.currentWord),
 
     /**
      * Returns true if a scripts are allowed to focus the given input
@@ -1044,6 +1031,26 @@ var Buffer = Module("buffer", {
     setZoom: deprecated("buffer.setZoom", function setZoom() buffer.setZoom.apply(buffer, arguments)),
     bumpZoomLevel: deprecated("buffer.bumpZoomLevel", function bumpZoomLevel() buffer.bumpZoomLevel.apply(buffer, arguments)),
 
+    /**
+     * Returns the currently selected word in *win*. If the selection is
+     * null, it tries to guess the word that the caret is positioned in.
+     *
+     * @returns {string}
+     */
+    currentWord: function (win) {
+        let selection = win.getSelection();
+        if (selection.rangeCount == 0)
+            return "";
+
+        let range = selection.getRangeAt(0).cloneRange();
+        if (range.collapsed) {
+            let re = options.get("iskeyword").regexp;
+            Editor.extendRange(range, true,  re, true);
+            Editor.extendRange(range, false, re, true);
+        }
+        return util.domToString(range);
+    },
+
     getDefaultNames: function getDefaultNames(node) {
         let url = node.href || node.src || node.documentURI;
         let currExt = url.replace(/^.*?(?:\.([a-z0-9]+))?$/i, "$1").toLowerCase();