diff --git a/js/id/ui/preset.js b/js/id/ui/preset.js
index 807926d05..e72d5c5ec 100644
--- a/js/id/ui/preset.js
+++ b/js/id/ui/preset.js
@@ -15,7 +15,7 @@ iD.ui.preset = function(context, entity, preset) {
 
         field.reference = iD.ui.TagReference(entity, {key: field.key});
 
-        if (field.type === 'address') {
+        if (field.type === 'address' || field.type === 'wikipedia') {
             field.input.entity(entity);
         }
 
diff --git a/js/id/ui/preset/wikipedia.js b/js/id/ui/preset/wikipedia.js
index e1262b580..70d5b495d 100644
--- a/js/id/ui/preset/wikipedia.js
+++ b/js/id/ui/preset/wikipedia.js
@@ -106,5 +106,9 @@ iD.ui.preset.wikipedia = function(field, context) {
         entity = _;
     };
 
+    i.focus = function() {
+        title.node().focus();
+    };
+
     return d3.rebind(i, event, 'on');
 };