diff --git a/examples/embeds/video.js b/examples/embeds/video.js
index 4206771b1..b2be592ea 100644
--- a/examples/embeds/video.js
+++ b/examples/embeds/video.js
@@ -9,6 +9,18 @@ import React from 'react'
 
 class Video extends React.Component {
 
+  /**
+   * Check if the node is selected.
+   *
+   * @return {Boolean}
+   */
+
+  isSelected = () => {
+    const { node, state } = this.props
+    const isSelected = state.selection.hasEdgeIn(node)
+    return isSelected
+  }
+
   /**
    * When the input text changes, update the `video` data on the node.
    *
@@ -65,11 +77,26 @@ class Video extends React.Component {
 
   renderVideo = () => {
     const video = this.props.node.data.get('video')
+    const isSelected = this.isSelected()
+
     const wrapperStyle = {
       position: 'relative',
       paddingBottom: '66.66%',
       paddingTop: '25px',
-      height: '0'
+      height: '0',
+      outline: isSelected ? '2px solid blue' : 'none',
+    }
+
+    const maskStyle = {
+      display: isSelected ? 'none' : 'block',
+      position: 'absolute',
+      top: '0px',
+      left: '0px',
+      right: '0px',
+      bottom: '0px',
+      height: '100%',
+      cursor: 'cell',
+      zIndex: 1,
     }
 
     const iframeStyle = {
@@ -77,11 +104,12 @@ class Video extends React.Component {
       top: '0px',
       left: '0px',
       width: '100%',
-      height: '100%'
+      height: '100%',
     }
 
     return (
       <div style={wrapperStyle}>
+        <div style={maskStyle} />
         <iframe
           id="ytplayer"
           type="text/html"
diff --git a/src/utils/normalize-node-and-offset.js b/src/utils/normalize-node-and-offset.js
index d37cd585b..05aa0d611 100644
--- a/src/utils/normalize-node-and-offset.js
+++ b/src/utils/normalize-node-and-offset.js
@@ -10,8 +10,8 @@
 
 function normalizeNodeAndOffset(node, offset) {
   // If it's an element node, its offset refers to the index of its children
-  // including comment nodes, so convert it to a text equivalent.
-  if (node.nodeType == 1) {
+  // including comment nodes, so try to find the right text child node.
+  if (node.nodeType == 1 && node.childNodes.length) {
     const isLast = offset == node.childNodes.length
     const direction = isLast ? 'backward' : 'forward'
     const index = isLast ? offset - 1 : offset