diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
index 747aed42d9..15ba722f60 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -187,6 +187,15 @@ class BookmarksTest {
         }.openThreeDotMenu(defaultWebPage.url) {
         }.clickCopy {
             verifyCopySnackBarText()
+            navigateUp()
+        }
+
+        navigationToolbar {
+        }.clickUrlbar {
+            clickClearButton()
+            longClickToolbar()
+            clickPasteText()
+            verifyPastedToolbarText(defaultWebPage.url.toString())
         }
     }
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
index 83444a26ca..207c8f9b14 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
@@ -41,7 +41,6 @@ import org.mozilla.fenix.helpers.TestHelper.scrollToElementByText
 import org.mozilla.fenix.helpers.ViewVisibilityIdlingResource
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.clickTabCrashedRestoreButton
-import org.mozilla.fenix.ui.robots.clickUrlbar
 import org.mozilla.fenix.ui.robots.collectionRobot
 import org.mozilla.fenix.ui.robots.customTabScreen
 import org.mozilla.fenix.ui.robots.downloadRobot
@@ -512,9 +511,8 @@ class SmokeTest {
         }.goToSearchEngine {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
         }.openNavigationToolbar {
-            clickUrlbar {
-                verifyDefaultSearchEngine("Google")
-            }
+        }.clickUrlbar {
+            verifyDefaultSearchEngine("Google")
         }
     }
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
index 750023dc50..cf13f754b6 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
@@ -249,6 +249,17 @@ class NavigationToolbarRobot {
             HomeScreenRobot().interact()
             return HomeScreenRobot.Transition()
         }
+
+        fun clickUrlbar(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
+            urlBar().click()
+
+            mDevice.findObject(
+                UiSelector().resourceId("$packageName:id/mozac_browser_toolbar_edit_url_view")
+            ).waitForExists(waitingTime)
+
+            SearchRobot().interact()
+            return SearchRobot.Transition()
+        }
     }
 }
 
@@ -257,12 +268,6 @@ fun navigationToolbar(interact: NavigationToolbarRobot.() -> Unit): NavigationTo
     return NavigationToolbarRobot.Transition()
 }
 
-fun clickUrlbar(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
-    urlBar().click()
-    SearchRobot().interact()
-    return SearchRobot.Transition()
-}
-
 fun openEditURLView() {
     mDevice.waitNotNull(
         Until.findObject(By.res("$packageName:id/toolbar")),