diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index a827364e6..c1595cd2c 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -764,6 +764,10 @@ MessengerUI, Messages, Pages) {
             $input.val(inputVal);
             $input.show();
             $input.focus();
+            if (inputVal === $input.attr('placeholder')) {
+                // Placeholder is the default name, select text to make editing easier
+                $input.select();
+            }
             $pencilIcon.hide();
             $saveIcon.show();
         };