diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 00e2c3d..903db1d 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1776,8 +1776,6 @@
         private AddAdapter mAdapter;
 
         Dialog createDialog() {
-            mWaitingForResult = true;
-
             mAdapter = new AddAdapter(Launcher.this);
 
             final AlertDialog.Builder builder = new AlertDialog.Builder(Launcher.this);
@@ -1867,6 +1865,7 @@
         }
 
         public void onShow(DialogInterface dialog) {
+            mWaitingForResult = true;            
         }
     }