diff --git a/Modules/Sources/UITestsFoundation/Screens/Orders/CustomerDetailsScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Orders/CustomerDetailsScreen.swift
index ceb48db25d3..f2b98c26cde 100644
--- a/Modules/Sources/UITestsFoundation/Screens/Orders/CustomerDetailsScreen.swift
+++ b/Modules/Sources/UITestsFoundation/Screens/Orders/CustomerDetailsScreen.swift
@@ -40,8 +40,12 @@ public final class CustomerDetailsScreen: ScreenObject {
     @discardableResult
     public func enterCustomerDetails(name: String) throws -> UnifiedOrderScreen {
         billingFirstNameField.tap()
-        billingFirstNameField.typeText(name)
+        // `\n` was added after the first name input in order to dismiss the keyboard so that the address toggle is interactive in shorter screens.
+        billingFirstNameField.typeText("\(name)\n")
+        let tableView = app.tables.firstMatch
+        tableView.swipeUp()
         addressToggleSet(to: "1")
+        tableView.swipeUp()
         shippingFirstNameField.tap()
         shippingFirstNameField.typeText(name)
         doneButton.tap()