diff --git a/cypress/elements/orders/draft-order-selectors.js b/cypress/elements/orders/draft-order-selectors.js
index 8cb752e32..2cd6218f1 100644
--- a/cypress/elements/orders/draft-order-selectors.js
+++ b/cypress/elements/orders/draft-order-selectors.js
@@ -6,7 +6,6 @@ export const DRAFT_ORDER_SELECTORS = {
   selectCustomerOption: "[data-test-type='option']",
   addShippingCarrierLink: "[data-test-id='add-shipping-carrier']",
   finalizeButton: "[data-test='button-bar-confirm']",
-  pageHeader: "[data-test-id='page-header']",
   editShippingAddress: '[data-test-id="edit-shipping-address"]',
   editBillingAddress: '[data-test-id="edit-billing-address"]',
   customerEmail: '[data-test-id="customer-email"]',
diff --git a/cypress/elements/shared/sharedElements.js b/cypress/elements/shared/sharedElements.js
index b7c79ada0..da31bc8fb 100644
--- a/cypress/elements/shared/sharedElements.js
+++ b/cypress/elements/shared/sharedElements.js
@@ -15,14 +15,15 @@ export const SHARED_ELEMENTS = {
   urlInput: 'input[type="url"]',
   richTextEditor: {
     loader: '[class*="codex-editor__loader"]',
-    empty: '[class*="codex-editor--empty"]'
+    empty: '[class*="codex-editor--empty"]',
   },
   contentEditable: '[contenteditable="true"]',
   filters: {
     filterGroupActivateCheckbox: '[data-test-id*="filter-group-active"]',
-    filterRow: '[data-test-id*="channel-availability-item"]'
+    filterRow: '[data-test-id*="channel-availability-item"]',
   },
-  warningDialog: '[data-test-id="warning-dialog"]'
+  warningDialog: '[data-test-id="warning-dialog"]',
+  pageHeader: "[data-test-id='page-header']",
 };
 
 export const selectorWithDataValue = value => `[data-value="${value}"]`;
diff --git a/cypress/support/pages/draftOrderPage.js b/cypress/support/pages/draftOrderPage.js
index 4dd584ad9..0abb13583 100644
--- a/cypress/support/pages/draftOrderPage.js
+++ b/cypress/support/pages/draftOrderPage.js
@@ -31,7 +31,7 @@ export function finalizeDraftOrder(name) {
     .get(SELECT_SHIPPING_METHOD_FORM.submitButton)
     .click()
     .wait("@OrderShippingMethodUpdate")
-    .getTextFromElement(DRAFT_ORDER_SELECTORS.pageHeader)
+    .getTextFromElement(SHARED_ELEMENTS.pageHeader)
     .as("draftOrderNumber")
     .addAliasToGraphRequest("OrderDraftFinalize")
     .get(DRAFT_ORDER_SELECTORS.finalizeButton)
diff --git a/cypress/support/pages/shippingMethodPage.js b/cypress/support/pages/shippingMethodPage.js
index 006cbd3c8..38a9139fe 100644
--- a/cypress/support/pages/shippingMethodPage.js
+++ b/cypress/support/pages/shippingMethodPage.js
@@ -1,6 +1,5 @@
 import { BUTTON_SELECTORS } from "../../elements/shared/button-selectors";
 import { SHARED_ELEMENTS } from "../../elements/shared/sharedElements";
-import { UNSAVED_CHANGES_DIALOG } from "../../elements/shared/unsavedChangesDialog";
 import { SHIPPING_RATE_DETAILS } from "../../elements/shipping/shipping-rate-details";
 import { SHIPPING_ZONE_DETAILS } from "../../elements/shipping/shipping-zone-details";
 import { SHIPPING_ZONES_LIST } from "../../elements/shipping/shipping-zones-list";
@@ -132,7 +131,12 @@ export function fillUpShippingRate({
     fillUpLimits(priceLimits);
   }
   cy.get(SHIPPING_RATE_DETAILS.priceInput).each($priceInput => {
-    cy.wrap($priceInput).clearAndType(price);
+    cy.wrap($priceInput)
+      .clear()
+      .get(SHARED_ELEMENTS.pageHeader)
+      .click()
+      .wrap($priceInput)
+      .clearAndType(price);
   });
 }