diff --git a/modules/geofield_map/js/geofield_map.js b/modules/geofield_map/js/geofield_map.js
index d405eb1..bf37263 100644
--- a/modules/geofield_map/js/geofield_map.js
+++ b/modules/geofield_map/js/geofield_map.js
@@ -105,7 +105,7 @@
             map.setCenter(new google.maps.LatLng(center.lat, center.lon));
           }
         }
-        
+
         function placeFeature(feature, map, range) {
           var properties = feature.get('geojsonProperties');
           if (feature.setTitle && properties && properties.title) {
@@ -124,9 +124,8 @@
           if (properties && properties.description) {
             var bounds = feature.get('bounds');
             google.maps.event.addListener(feature, 'click', function() {
-              infowindow.setPosition(bounds.getCenter());
               infowindow.setContent(properties.description);
-              infowindow.open(map);
+              infowindow.open(map, feature);
             });
           }
         }