diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java
index 328a5ca2b0..918ffaa15c 100644
--- a/src/com/android/launcher/Launcher.java
+++ b/src/com/android/launcher/Launcher.java
@@ -614,9 +614,11 @@ public final class Launcher extends Activity implements View.OnClickListener, On
     }
 
     private void createGesture() {
-        mCurrentGesture = mGesturesOverlay.getGesture();
-        mWaitingForResult = true;
-        pickShortcut(REQUEST_PICK_GESTURE_ACTION, R.string.title_select_shortcut);
+        if (!mWaitingForResult) {
+            mCurrentGesture = mGesturesOverlay.getGesture();
+            mWaitingForResult = true;
+            pickShortcut(REQUEST_PICK_GESTURE_ACTION, R.string.title_select_shortcut);
+        }
     }
 
     private void completeCreateGesture(Intent data, boolean isShortcut) {