diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index a4087d5185147..fcd08bbf8a8d2 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8201,7 +8201,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
             vibrate = false;
         }
 
-        if (!handled && (mEditor == null || getEditor().mSelectionActionMode != null)) {
+        if (!handled && mEditor != null && getEditor().mSelectionActionMode != null) {
             if (touchPositionIsInSelection()) {
                 // Start a drag
                 final int start = getSelectionStart();