diff --git a/src/form-builder-controls.js b/src/form-builder-controls.js
index ce53568ee..0ae341a31 100755
--- a/src/form-builder-controls.js
+++ b/src/form-builder-controls.js
@@ -349,7 +349,7 @@ export default [
       order: 2.0,
       group: 'Navigation',
       label: 'Page Navigation',
-      component: 'FormPageNavigation',
+      component: 'FormButton',
       'editor-component': 'FormButton',
       'editor-control': 'PageNavigation',
       config: {
diff --git a/tests/e2e/specs/ClipboardTestCases.spec.js b/tests/e2e/specs/ClipboardTestCases.spec.js
index 7269289bc..393d74dd3 100644
--- a/tests/e2e/specs/ClipboardTestCases.spec.js
+++ b/tests/e2e/specs/ClipboardTestCases.spec.js
@@ -1,6 +1,8 @@
 describe("Clipboard Button Actions", () => {
 
   it("TCP4-4441: Verify clipboard in section column and dropdown menu", () => {
+    // Clear local storage
+    cy.clearLocalStorage();
     cy.visit("/");
     cy.openAcordeonByLabel("Clipboard");
     cy.get("[data-cy=screen-drop-zone]").should(
@@ -148,8 +150,9 @@ describe("Clipboard Button Actions", () => {
     cy.visit("/");
     cy.openAcordeonByLabel("Navigation");
     cy.wait(1000);
-
-    cy.get('[data-cy="controls"] > [data-cy="controls-FormPageNavigation"]').drag("[data-cy=screen-drop-zone]", { position: "bottom" });
+    
+    
+    cy.get('[data-cy=controls-FormButton]:contains("Page")').drag("[data-cy=screen-drop-zone]", { position: "bottom" });
 
     cy.get(':nth-child(1) > [data-cy="screen-element-container"]').click();
     cy.get('[data-cy="addToClipboard"]').should("be.visible");