diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index a22a466a75..ac5c1b9d26 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -910,8 +910,12 @@ public class Workspace extends SmoothPagedView
                     cl.setRotationY(rotation);
                 }
             }
-            s.addListener(mUnshrinkAnimationListener);
-            s.start();
+            if (animated) {
+                // If we call this when we're not animated, onAnimationEnd is never called on
+                // the listener; make sure we only use the listener when we're actually animating
+                s.addListener(mUnshrinkAnimationListener);
+                s.start();
+            }
         }
     }