diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index 428d7b3..014356b 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -27,6 +27,8 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.text.InputType;
+import android.text.Selection;
+import android.text.Spannable;
 import android.util.AttributeSet;
 import android.view.ActionMode;
 import android.view.KeyEvent;
@@ -240,6 +242,7 @@
         LauncherModel.updateItemInDatabase(mLauncher, mInfo);
         mFolderName.setCursorVisible(false);
         mFolderName.clearFocus();
+        Selection.setSelection((Spannable) mFolderName.getText(), 0, 0);
         mIsEditingName = false;
     }