diff --git a/core/java/com/android/internal/widget/ActionBarContextView.java b/core/java/com/android/internal/widget/ActionBarContextView.java
index 5ae36169e18d0..f9d8ca9949cc5 100644
--- a/core/java/com/android/internal/widget/ActionBarContextView.java
+++ b/core/java/com/android/internal/widget/ActionBarContextView.java
@@ -159,7 +159,7 @@ public class ActionBarContextView extends ViewGroup implements AnimatorListener
     }
 
     public void initForMode(final ActionMode mode) {
-        if (mAnimationMode == ANIMATE_OUT) {
+        if (mAnimationMode != ANIMATE_IDLE || mAnimateInOnLayout) {
             killMode();
         }