diff --git a/src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5 b/src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5
index 6375db0..70b26e8 100644
--- a/src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5
+++ b/src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5
@@ -17,6 +17,12 @@
         placeholder: '<?php echo $GLOBALS['TL_LANG']['leaflet']['searchPosition']; ?>'
     }).addTo(map);
 
+    document.querySelector('.leaflet-control-geocoder input').addEventListener('keydown', function (event) {
+        if (event.keyCode === 13) {
+            event.preventDefault();
+        }
+    });
+
     geocoder.on('markgeocode', function (event) {
         var container = document.createElement('div');
         var link = document.createElement('button');
@@ -28,7 +34,8 @@
             e.stop();
 
             element.set('value', result.center.lat + ',' + result.center.lng);
-        });
+            this._geocodeMarker.closePopup();
+        }.bind(this));
 
         container.appendHTML(result.html || result.name);
         container.appendChild(link);