diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index df933cb50493e..8cb725af787d3 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -7364,7 +7364,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
 
                     stopSelectionActionMode();
                     boolean selectAllGotFocus = mSelectAllOnFocus && mTouchFocusSelected;
-                    if (hasInsertionController() && !selectAllGotFocus) {
+                    if (hasInsertionController() && !selectAllGotFocus && mText.length() > 0) {
                         getInsertionController().show();
                     }
                 }
@@ -8887,6 +8887,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                     mLastParentX = coords[0];
                     mLastParentY = coords[1];
                     mIsDragging = true;
+                    if (mIsInsertionHandle) {
+                        mTouchTimer = SystemClock.uptimeMillis();
+                    }
                     break;
                 }
 
@@ -9035,6 +9038,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
 
             if (offset != previousOffset) {
                 updateOffset(handle, offset);
+                removePastePopupCallback();
             }
             hideDelayed();
         }