diff --git a/EditorGroup.js b/EditorGroup.js
index 022df86..d1ea11b 100644
--- a/EditorGroup.js
+++ b/EditorGroup.js
@@ -22,8 +22,9 @@ class EditorGroup extends EditorEntryBase {
 
   afterDomAdd() {
     this.nodes_.selectNext();
-    if (this.nodes_.getSelected().getValue() == '') {
-      this.nodes_.getSelected().xArchObj.startEdit();
+    let node = this.nodes_.getSelected().xArchObj;
+    if (node.getLabel() == '') {
+      node.startEdit();
     }
   }
 
diff --git a/EditorLink.js b/EditorLink.js
index b4a27fa..a508ab4 100644
--- a/EditorLink.js
+++ b/EditorLink.js
@@ -19,12 +19,9 @@ class EditorLink extends EditorEntryBase {
 
   afterDomAdd() {
     this.nodes_.selectNext();
-    if (this.nodes_.getSelected().getValue() != '') {
-      // Select second link if first is pre-filled
-      this.nodes_.selectNext();
-    }
-    if (this.nodes_.getSelected().getValue() == '') {
-      this.nodes_.getSelected().xArchObj.startEdit();
+    let node = this.nodes_.getSelected().xArchObj;
+    if (node.getLabel() == '') {
+      node.startEdit();
     }
   }