diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index f45b0a1..ac121cc 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -242,6 +242,9 @@
     }
 
     void editUrl(boolean clearInput) {
+        if (mUiController.isInCustomActionMode()) {
+            mUiController.endActionMode();
+        }
         showFakeTitleBar();
         mFakeTitleBar.onEditUrl(clearInput);
     }