diff --git a/src/commands/view/ComponentEnter.js b/src/commands/view/ComponentEnter.js
index fa17b4a03..f1cf528b4 100644
--- a/src/commands/view/ComponentEnter.js
+++ b/src/commands/view/ComponentEnter.js
@@ -5,7 +5,7 @@ export default {
 
     ed.getSelectedAll().forEach(component => {
       const coll = component.components();
-      const next = coll && coll.at(0);
+      const next = coll && coll.filter(c => c.get('selectable'))[0];
       next && toSelect.push(next);
     });
 
diff --git a/src/dom_components/model/ComponentTextNode.js b/src/dom_components/model/ComponentTextNode.js
index 0f9687702..9b79a9bf5 100644
--- a/src/dom_components/model/ComponentTextNode.js
+++ b/src/dom_components/model/ComponentTextNode.js
@@ -7,6 +7,7 @@ export default Component.extend(
       tagName: '',
       droppable: false,
       layerable: false,
+      selectable: false,
       editable: true
     },