diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index e8ce7ee..a9fa879 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2444,6 +2444,7 @@
             mWebViewCore.sendMessage(EventHub.SET_SCROLL_OFFSET,
                     nativeMoveGeneration(), mUserScroll ? 1 : 0, pos);
             mLastVisibleRectSent = rect;
+            mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS);
         }
         Rect globalRect = new Rect();
         if (getGlobalVisibleRect(globalRect)
@@ -7574,6 +7575,7 @@
         if (mNativeClass == 0) {
             return false;
         }
+        mInitialHitTestResult = null;
         mLastCursorTime = time;
         mLastCursorBounds = nativeGetCursorRingBounds();
         boolean keyHandled