diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java
index 334b369..7321a79 100644
--- a/src/com/android/launcher2/AppsCustomizeTabHost.java
+++ b/src/com/android/launcher2/AppsCustomizeTabHost.java
@@ -355,19 +355,19 @@
     public boolean onLauncherTransitionStart(Launcher l, Animator animation, boolean toWorkspace) {
         mInTransition = true;
         boolean delayLauncherTransitionUntilLayout = false;
+        boolean animated = (animation != null);
         mLauncherTransition = null;
 
-        // if the content wasn't visible before, delay the launcher animation until after a cal
+        // if the content wasn't visible before, delay the launcher animation until after a call
         // to layout -- this prevents a blip
-        if (animation != null) {
-            if (mContent.getVisibility() == GONE) {
-                mLauncherTransition = animation;
-                delayLauncherTransitionUntilLayout = true;
-            }
-            mContent.setVisibility(VISIBLE);
-            if (!delayLauncherTransitionUntilLayout) {
-                enableAndBuildHardwareLayer();
-            }
+        if (animated && mContent.getVisibility() == GONE) {
+            mLauncherTransition = animation;
+            delayLauncherTransitionUntilLayout = true;
+        }
+        mContent.setVisibility(VISIBLE);
+
+        if (animated && !delayLauncherTransitionUntilLayout) {
+            enableAndBuildHardwareLayer();
         }
 
         if (!toWorkspace && !LauncherApplication.isScreenLarge()) {
