diff --git a/index.js b/index.js
index 8c2cd9039..e95465356 100644
--- a/index.js
+++ b/index.js
@@ -125,7 +125,8 @@ function findSiblingAncestors(startNodeAndParents, endNodeAndParents) {
   };
 }
 
-function findNodeAtOffset(node, offset, parentNodes) {
+function findNodeAtOffset(node, offset, predicate, parentNodes) {
+  predicate = predicate || (() => true);
   parentNodes = parentNodes || [];
   const start = util.locStart(node);
   const end = util.locEnd(node);
@@ -134,6 +135,7 @@ function findNodeAtOffset(node, offset, parentNodes) {
       const childResult = findNodeAtOffset(
         childNode,
         offset,
+        predicate,
         [node].concat(parentNodes)
       );
       if (childResult) {
@@ -141,7 +143,7 @@ function findNodeAtOffset(node, offset, parentNodes) {
       }
     }
 
-    if (isSourceElement(node)) {
+    if (predicate(node)) {
       return {
         node: node,
         parentNodes: parentNodes
@@ -199,8 +201,16 @@ function calculateRange(text, opts, ast) {
     }
   }
 
-  const startNodeAndParents = findNodeAtOffset(ast, startNonWhitespace);
-  const endNodeAndParents = findNodeAtOffset(ast, endNonWhitespace);
+  const startNodeAndParents = findNodeAtOffset(
+    ast,
+    startNonWhitespace,
+    isSourceElement
+  );
+  const endNodeAndParents = findNodeAtOffset(
+    ast,
+    endNonWhitespace,
+    isSourceElement
+  );
   const siblingAncestors = findSiblingAncestors(
     startNodeAndParents,
     endNodeAndParents
diff --git a/tests/cursor/jsfmt.spec.js b/tests/cursor/jsfmt.spec.js
index 090654b16..e5a0dc39d 100644
--- a/tests/cursor/jsfmt.spec.js
+++ b/tests/cursor/jsfmt.spec.js
@@ -6,3 +6,19 @@ test("translates cursor correctly in basic case", () => {
     cursorOffset: 1
   });
 });
+
+test("positions cursor relative to closest node, not SourceElement", () => {
+  const code = "return         15";
+  expect(prettier.formatWithCursor(code, { cursorOffset: 15 })).toEqual({
+    formatted: "return 15;\n",
+    cursorOffset: 7
+  });
+});
+
+test("keeps cursor inside formatted node", () => {
+  const code = "return         15";
+  expect(prettier.formatWithCursor(code, { cursorOffset: 14 })).toEqual({
+    formatted: "return 15;\n",
+    cursorOffset: 14 // TODO fix this
+  });
+});