diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 9f7b021831..bf12d79485 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1922,6 +1922,8 @@ public class Launcher extends Activity
     }
 
     protected void moveToCustomContentScreen(boolean animate) {
+        // Close any folders that may be open.
+        closeFolder();
         mWorkspace.moveToCustomContentScreen(animate);
     }
     /**