diff --git a/res/anim/task_open_enter.xml b/res/anim/task_open_enter.xml
index b2aadd7fa7..3eb191537b 100644
--- a/res/anim/task_open_enter.xml
+++ b/res/anim/task_open_enter.xml
@@ -23,12 +23,12 @@
     <alpha android:fromAlpha="0" android:toAlpha="1.0"
             android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
             android:interpolator="@interpolator/decelerate_quart"
-            android:startOffset="300"
+            android:startOffset="0"
             android:duration="167"/>
 
     <translate android:fromYDelta="110%" android:toYDelta="0"
             android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
             android:interpolator="@interpolator/decelerate_quint"
-            android:startOffset="300"
+            android:startOffset="0"
             android:duration="417" />
-</set>
\ No newline at end of file
+</set>
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 3cbe1c1dd2..a5bf690d74 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2776,12 +2776,9 @@ public class Launcher extends Activity
 
             Bundle optsBundle = null;
             if (useLaunchAnimation) {
-                ActivityOptions opts = ActivityOptions.makeScaleUpAnimation(v, 0, 0,
-                        v.getMeasuredWidth(), v.getMeasuredHeight());
-                optsBundle = opts.toBundle();
-            }
-            if (useLaunchAnimation && Utilities.isLmp()) {
-                ActivityOptions opts = ActivityOptions.makeCustomAnimation(this, R.anim.task_open_enter, R.anim.no_anim);
+                ActivityOptions opts = Utilities.isLmp() ?
+                        ActivityOptions.makeCustomAnimation(this, R.anim.task_open_enter, R.anim.no_anim) :
+                        ActivityOptions.makeScaleUpAnimation(v, 0, 0, v.getMeasuredWidth(), v.getMeasuredHeight());
                 optsBundle = opts.toBundle();
             }