diff --git a/www/maposmatic/templates/maposmatic/new.html b/www/maposmatic/templates/maposmatic/new.html
index 879f8788..76c5ca5d 100644
--- a/www/maposmatic/templates/maposmatic/new.html
+++ b/www/maposmatic/templates/maposmatic/new.html
@@ -46,6 +46,17 @@ $('.multipleSelect').fastselect({
         $("#overlay-preview").attr("src","/media/img/overlay/"+itemModel.value+".jpg");
     }
 });
+
+// give focus to admin_city input field when selecting the admin_city tab
+const admin_tab = document.querySelector('#step-location-admin-tab');
+admin_tab.addEventListener('show.bs.tab', function(e){
+  // no idea why the setTimeout() wrapper is needed, but it is. do not remove ...
+  setTimeout(function () {
+    var input =  $('#id_administrative_city');
+    input.focus();
+  }, 0);
+});
+
 {% if form.errors %}
 $('#error-modal').modal('show')
 {% endif%}
diff --git a/www/maposmatic/templates/maposmatic/suggest.js b/www/maposmatic/templates/maposmatic/suggest.js
index aaa9e58e..c1c33c2e 100644
--- a/www/maposmatic/templates/maposmatic/suggest.js
+++ b/www/maposmatic/templates/maposmatic/suggest.js
@@ -38,7 +38,7 @@
  */
 (function suggest(input, list, target, timeout) {
 
-  input.attr('autocomplete', 'off').attr('placeholder', '{% trans "Start typing for suggestions..." %}').focus();
+  input.attr('autocomplete', 'off').attr('placeholder', '{% trans "Start typing for suggestions..." %}');
 
   var timeoutId = null;
   var ajaxquery = null;