diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index dfe54ec389d..7f021544636 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -1617,6 +1617,10 @@ abstract public class BrowserApp extends GeckoApp
             throw new IllegalArgumentException("Cannot handle null URLs in enterEditingMode");
         }
 
+        if (mBrowserToolbar.isEditing() || mBrowserToolbar.isAnimating()) {
+            return;
+        }
+
         final Tab selectedTab = Tabs.getInstance().getSelectedTab();
         mTargetTabForEditingMode = (selectedTab != null ? selectedTab.getId() : null);
 
diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java
index d0ead8ce825..0ed41cbc177 100644
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/toolbar/BrowserToolbar.java
@@ -934,6 +934,10 @@ public class BrowserToolbar extends ThemedRelativeLayout
         return (uiMode == UIMode.EDIT);
     }
 
+    public boolean isAnimating() {
+        return isAnimatingEntry;
+    }
+
     public void startEditing(String url, PropertyAnimator animator) {
         if (isEditing()) {
             return;