diff --git a/lib/DraggableCore.js b/lib/DraggableCore.js
index a80eb1b8..996d89dc 100644
--- a/lib/DraggableCore.js
+++ b/lib/DraggableCore.js
@@ -297,10 +297,6 @@ export default class DraggableCore extends React.Component<DraggableCoreProps, D
     const shouldUpdate = this.props.onStart(e, coreEvent);
     if (shouldUpdate === false || this.mounted === false) return;
 
-    // Add a style to the body to disable user-select. This prevents text from
-    // being selected all over the page.
-    if (this.props.enableUserSelectHack) addUserSelectStyles(ownerDocument);
-
     // Initiate dragging. Set the current x and y as offsets
     // so we know how much we've moved during the drag. This allows us
     // to drag elements around even if they have been moved, without issue.
@@ -354,6 +350,13 @@ export default class DraggableCore extends React.Component<DraggableCoreProps, D
       return;
     }
 
+    const thisNode = ReactDOM.findDOMNode(this);
+    if (thisNode) {
+      // Add a style to the body to disable user-select. This prevents text from
+      // being selected all over the page.
+      if (this.props.enableUserSelectHack) addUserSelectStyles(thisNode.ownerDocument);
+    }
+
     this.setState({
       lastX: x,
       lastY: y
diff --git a/specs/draggable.spec.jsx b/specs/draggable.spec.jsx
index 470d26ca..10201798 100644
--- a/specs/draggable.spec.jsx
+++ b/specs/draggable.spec.jsx
@@ -357,20 +357,22 @@ describe('react-draggable', function () {
     });
 
     it('should add and remove transparent selection class', function () {
-       drag = TestUtils.renderIntoDocument(
-         <Draggable>
-           <div />
-         </Draggable>
-       );
-
-       const node = ReactDOM.findDOMNode(drag);
+      drag = TestUtils.renderIntoDocument(
+        <Draggable>
+          <div />
+        </Draggable>
+      );
 
-       assert(!document.body.classList.contains('react-draggable-transparent-selection'));
-       TestUtils.Simulate.mouseDown(node, {clientX: 0, clientY: 0});
-       assert(document.body.classList.contains('react-draggable-transparent-selection'));
-       TestUtils.Simulate.mouseUp(node);
-       assert(!document.body.classList.contains('react-draggable-transparent-selection'));
-     });
+      const node = ReactDOM.findDOMNode(drag);
+      
+      assert(!document.body.classList.contains('react-draggable-transparent-selection'));
+      TestUtils.Simulate.mouseDown(node, {clientX: 0, clientY: 0});
+      assert(!document.body.classList.contains('react-draggable-transparent-selection'));
+      mouseMove(100, 100, node);
+      assert(document.body.classList.contains('react-draggable-transparent-selection'));
+      TestUtils.Simulate.mouseUp(node);
+      assert(!document.body.classList.contains('react-draggable-transparent-selection'));
+    });
 
     it('should not add and remove transparent selection class when disabled', function () {
 
@@ -493,6 +495,9 @@ describe('react-draggable', function () {
           assert(!iframeDoc.body.classList.contains('react-draggable-transparent-selection'));
           TestUtils.Simulate.mouseDown(node, {clientX: 0, clientY: 0});
           assert(!document.body.classList.contains('react-draggable-transparent-selection'));
+          assert(!iframeDoc.body.classList.contains('react-draggable-transparent-selection'));
+          mouseMove(100, 100, node);
+          assert(!document.body.classList.contains('react-draggable-transparent-selection'));
           assert(iframeDoc.body.classList.contains('react-draggable-transparent-selection'));
           TestUtils.Simulate.mouseUp(node);
           assert(!document.body.classList.contains('react-draggable-transparent-selection'));