diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java
index b658d84d71..e714888152 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java
@@ -39,6 +39,7 @@ import org.chromium.components.browser_ui.share.ShareParams;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.content_public.browser.ActionModeCallback;
 import org.chromium.content_public.browser.ActionModeCallbackHelper;
+import org.chromium.content_public.browser.NavigationHandle;
 import org.chromium.content_public.browser.SelectionPopupController;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.url.GURL;
@@ -103,6 +104,11 @@ public class ChromeActionModeHandler {
                 SelectionPopupController.fromWebContents(tab.getWebContents()).clearSelection();
             }

+            @Override
+            public void onDidFinishNavigationInPrimaryMainFrame(Tab tab, NavigationHandle navigation) {
+                SelectionPopupController.fromWebContents(tab.getWebContents()).clearSelection();
+            }
+
             @Override
             public void onContentChanged(Tab tab) {
                 SelectionPopupController.fromWebContents(tab.getWebContents()).clearSelection();
diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
index bfacd48cdf..3b5709f007 100644
--- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
@@ -1706,6 +1706,9 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
         mWebContents.collapseSelection();
         mClassificationResult = null;
         setHasSelection(false);
+        if (getMagnifierAnimator() != null) {
+            getMagnifierAnimator().handleDragStopped();
+        }
     }

     private PopupController getPopupController() {