diff --git a/EditorGroup.js b/EditorGroup.js
index f861b9c..022df86 100644
--- a/EditorGroup.js
+++ b/EditorGroup.js
@@ -22,7 +22,9 @@ class EditorGroup extends EditorEntryBase {
 
   afterDomAdd() {
     this.nodes_.selectNext();
-    this.nodes_.getSelected().xArchObj.startEdit();
+    if (this.nodes_.getSelected().getValue() == '') {
+      this.nodes_.getSelected().xArchObj.startEdit();
+    }
   }
 
   serialize() {
diff --git a/EditorLink.js b/EditorLink.js
index 3f5b428..b4a27fa 100644
--- a/EditorLink.js
+++ b/EditorLink.js
@@ -19,7 +19,13 @@ class EditorLink extends EditorEntryBase {
 
   afterDomAdd() {
     this.nodes_.selectNext();
-    this.nodes_.getSelected().xArchObj.startEdit();
+    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();
+    }
   }
 
   serialize() {