diff --git a/src/com/android/launcher/GesturesActivity.java b/src/com/android/launcher/GesturesActivity.java
index 3ea49e251c..844392dc2e 100644
--- a/src/com/android/launcher/GesturesActivity.java
+++ b/src/com/android/launcher/GesturesActivity.java
@@ -167,7 +167,7 @@ public class GesturesActivity extends ListActivity {
     @Override
     protected void onPrepareDialog(int id, Dialog dialog) {
         super.onPrepareDialog(id, dialog);
-        if (id == DIALOG_RENAME_GESTURE) {
+        if (id == DIALOG_RENAME_GESTURE && mCurrentRenameInfo != null) {
             mInput.setText(mCurrentRenameInfo.title);
         }
     }