diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 4fe655e..93ce9d5 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -183,6 +183,7 @@
     private boolean mRestoring;
     private boolean mWaitingForResult;
     private boolean mLocaleChanged;
+    private boolean mExitingBecauseOfLaunch;
 
     private boolean mHomeDown;
     private boolean mBackDown;
@@ -416,7 +417,10 @@
     @Override
     protected void onPause() {
         super.onPause();
-        closeAllApps(false);
+        if (mExitingBecauseOfLaunch) {
+            mExitingBecauseOfLaunch = false;
+            closeAllApps(false);
+        }
     }
 
     @Override
@@ -1330,6 +1334,7 @@
             // Open shortcut
             final Intent intent = ((ApplicationInfo) tag).intent;
             startActivitySafely(intent);
+            mExitingBecauseOfLaunch = true;
         } else if (tag instanceof FolderInfo) {
             handleFolderClick((FolderInfo) tag);
         } else if (v == mHandleView) {
