diff --git a/src/WizardBuilder.js b/src/WizardBuilder.js
index 7d56d59ce7..55e7bc327b 100644
--- a/src/WizardBuilder.js
+++ b/src/WizardBuilder.js
@@ -70,8 +70,8 @@ export default class WizardBuilder extends WebformBuilder {
         this.rebuild();
       }
       else {
-        // Fallback to look for panel based on key.
-        const formComponentIndex = this._form.components.findIndex((comp) => originalComponent.key === comp.key);
+        // Fallback to look for panel based on id.
+        const formComponentIndex = this._form.components.findIndex((comp) => originalComponent.id === comp.id);
         if (formComponentIndex !== -1) {
           this._form.components[formComponentIndex] = component;
           this.rebuild();
diff --git a/test/unit/WizardBuilder.unit.js b/test/unit/WizardBuilder.unit.js
index 3a3fbc782c..8034ef1285 100644
--- a/test/unit/WizardBuilder.unit.js
+++ b/test/unit/WizardBuilder.unit.js
@@ -119,4 +119,59 @@ describe('WizardBuilder tests', function() {
       done();
     }, 500);
   });
+
+  describe('Test saveComponent', () => {
+    it('should replace page component correctly in form object', function(done) {
+      const builder = createWizardBuilder(simpleWizard);
+      const page = builder.instance.webform.components[0];
+      const editComponentRef = page.refs.editComponent;
+
+      Harness.clickElement(page, editComponentRef);
+      setTimeout(() => {
+        assert(builder.instance.editForm, 'Should create the settings form on component edit');
+        const labelComponent = builder.instance.editForm.getComponent('label');
+        labelComponent.updateValue('This is page 1');
+        const saveButton = builder.instance.componentEdit.querySelector('[ref="saveButton"]');
+        Harness.clickElement(page, saveButton);
+        setTimeout(() => {
+          assert.equal(builder.instance.form.components[0].label, 'This is page 1');
+          done();
+        }, 100);
+      }, 100);
+    });
+
+    it('should not remove page when component with duplicate API key is changed', function(done) {
+      const builder = createWizardBuilder(simpleWizard);
+      const page1 = builder.instance.webform.components[0];
+
+      let component1 = builder.instance.webform.components[0].components[0];
+      Harness.clickElement(component1, component1.refs.editComponent);
+      setTimeout(() => {
+        assert(builder.instance.editForm, 'Should create the settings form on component edit');
+        const keyComponent = builder.instance.editForm.getComponent('key');
+        keyComponent.updateValue(page1.key);
+        const saveButton = builder.instance.componentEdit.querySelector('[ref="saveButton"]');
+        Harness.clickElement(component1, saveButton);
+        setTimeout(() => {
+          component1 = builder.instance.webform.components[0].components[0];
+          assert.equal(component1.errors.length, 1, 'Should have error due to duplicate API key');
+          assert.equal(component1.errors[0].message, `API Key is not unique: ${page1.key}`);
+
+          Harness.clickElement(component1, component1.refs.editComponent);
+          setTimeout(() => {
+            assert(builder.instance.editForm, 'Should create the settings form on component edit');
+            const keyComponent = builder.instance.editForm.getComponent('key');
+            keyComponent.updateValue('some-unique-key');
+            const saveButton = builder.instance.componentEdit.querySelector('[ref="saveButton"]');
+            Harness.clickElement(component1, saveButton);
+            setTimeout(() => {
+              assert.equal(builder.instance.form.components[0].label, page1.label, 'Page 1 should still exist');
+              assert.equal(builder.instance.form.components[0].components[0].key, 'some-unique-key', 'Component should have new key');
+              done();
+            }, 200);
+          }, 200);
+        }, 200);
+      }, 200);
+    });
+  });
 });