diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 4dd2e0a..d75006e 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -480,8 +480,7 @@
      */
     public ObjectAnimator createTextAlphaAnimator(boolean fadeIn) {
         float toAlpha = shouldTextBeVisible() && fadeIn ? 1 : 0;
-        float fromAlpha = toAlpha == 1 ? 0 : 1f;
-        return ObjectAnimator.ofFloat(this, TEXT_ALPHA_PROPERTY, fromAlpha, toAlpha);
+        return ObjectAnimator.ofFloat(this, TEXT_ALPHA_PROPERTY, toAlpha);
     }
 
     @Override
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index fab21fa..524c69f 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -421,12 +421,6 @@
                     @Override
                     public void onAnimationStart(Animator animation) {
                         originalView.setVisibility(VISIBLE);
-
-                        if (originalView instanceof FolderIcon) {
-                            FolderIcon folderIcon = (FolderIcon) originalView;
-                            folderIcon.setBackgroundVisible(false);
-                            folderIcon.getFolderName().setTextVisibility(false);
-                        }
                     }
 
                     @Override
@@ -441,6 +435,8 @@
 
                 if (originalView instanceof FolderIcon) {
                     FolderIcon folderIcon = (FolderIcon) originalView;
+                    folderIcon.setBackgroundVisible(false);
+                    folderIcon.getFolderName().setTextVisibility(false);
                     fade.play(folderIcon.getFolderName().createTextAlphaAnimator(true));
                     fade.addListener(new AnimatorListenerAdapter() {
                         @Override