diff --git a/src/feature_layer.js b/src/feature_layer.js
index b73c0fe19..fd6272f23 100644
--- a/src/feature_layer.js
+++ b/src/feature_layer.js
@@ -91,10 +91,11 @@ var FeatureLayer = L.FeatureGroup.extend({
                 pointToLayer = this.options.pointToLayer || function(feature, latlon) {
                   return marker.style(feature, latlon, opts);
                 },
+                popupHtml = marker.createPopup(json, this.options.sanitizer),
                 layer = L.GeoJSON.geometryToLayer(json, {
-                    pointToLayer: pointToLayer
+                    pointToLayer: pointToLayer,
+                    interactive: !!popupHtml
                 }),
-                popupHtml = marker.createPopup(json, this.options.sanitizer),
                 style = this.options.style,
                 defaultStyle = style === simplestyle.style;