diff --git a/lib/components/map/stops-overlay.js b/lib/components/map/stops-overlay.js
index <HASH>..<HASH> 100644
--- a/lib/components/map/stops-overlay.js
+++ b/lib/components/map/stops-overlay.js
@@ -1,6 +1,6 @@
 import React, { PropTypes } from 'react'
 import { connect } from 'react-redux'
-import { MapLayer, Marker, Popup } from 'react-leaflet'
+import { FeatureGroup, MapLayer, Marker, Popup } from 'react-leaflet'
 import { Button, ButtonGroup } from 'react-bootstrap'
 import { divIcon } from 'leaflet'
 
@@ -55,7 +55,7 @@ class StopsOverlay extends MapLayer {
     if (this.context.map.getZoom() < minZoom || !hasTransit(queryMode)) return null
 
     return (
-      <div>
+      <FeatureGroup>
         {stops.map((stop) => {
           const icon = divIcon({
             iconSize: [20, 20],
@@ -106,7 +106,7 @@ class StopsOverlay extends MapLayer {
             </Marker>
           )
         })}
-      </div>
+      </FeatureGroup>
     )
   }
 }
feat(overlay): Make StopsOverlay a FeatureGroup