diff --git a/src/c3nav/editor/static/editor/js/editor.js b/src/c3nav/editor/static/editor/js/editor.js
index e7473fd9..371bd403 100644
--- a/src/c3nav/editor/static/editor/js/editor.js
+++ b/src/c3nav/editor/static/editor/js/editor.js
@@ -463,6 +463,7 @@ editor = {
             editor._editing.on('click', editor._click_editing_layer);
             editor._update_editing();
             $('#mapeditcontrols').find('form.creation-lock').removeClass('creation-lock');
+            $('#id_name').focus();
         }
     },
     _update_editing: function () {