diff --git a/lib/template/address-html.php b/lib/template/address-html.php
index db735477..621c9773 100644
--- a/lib/template/address-html.php
+++ b/lib/template/address-html.php
@@ -15,7 +15,7 @@
             <input name="format" type="hidden" value="html">
             lat
             <input name="lat" type="text" class="form-control input-sm" placeholder="latitude" value="<?php echo $fLat; ?>" >
-            <span id="switch-coords" title="switch lat and lon">&lt;&gt;</span>
+            <button class="btn btn-default btn-xs" id="switch-coords" title="switch lat and lon">&lt;&gt;</button>
             lon
             <input name="lon" type="text" class="form-control input-sm" placeholder="longitude" value="<?php echo $fLon; ?>" >
             max zoom
diff --git a/website/js/nominatim-ui.js b/website/js/nominatim-ui.js
index 0560b45f..956feae6 100644
--- a/website/js/nominatim-ui.js
+++ b/website/js/nominatim-ui.js
@@ -248,6 +248,14 @@ jQuery(document).on('ready', function(){
 
     highlight_result(0, false);
 
+    // common mistake is to copy&paste latitude and longitude into the 'lat' search box
+    $('form input[name=lat]').on('change', function(){
+        var coords = $(this).val().split(',');
+        if (coords.length == 2) {
+            $(this).val(coords[0]);
+            $(this).siblings('input[name=lon]').val(coords[1]);
+        }
+    });
 
 });