diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 382710da55e80..426c9d463f14b 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -1507,9 +1507,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
                     if (lastHoverTarget != null) {
                         lastHoverTarget.next = hoverTarget;
                     } else {
-                        lastHoverTarget = hoverTarget;
                         mFirstHoverTarget = hoverTarget;
                     }
+                    lastHoverTarget = hoverTarget;
 
                     // Dispatch the event to the child.
                     if (action == MotionEvent.ACTION_HOVER_ENTER) {