diff --git a/modules/ui/geolocate.js b/modules/ui/geolocate.js
index 217bf9dbd..2b6ed59aa 100644
--- a/modules/ui/geolocate.js
+++ b/modules/ui/geolocate.js
@@ -1,3 +1,5 @@
+import { select as d3_select } from 'd3-selection';
+
 import { t, textDirection } from '../util/locale';
 import { tooltip } from '../util/tooltip';
 import { geoExtent } from '../geo';
@@ -13,6 +15,7 @@ export function uiGeolocate(context) {
     var _position;
     var _extent;
     var _timeoutID;
+    var _button = d3_select(null);
 
     function click() {
         if (context.inIntro()) return;
@@ -26,6 +29,7 @@ export function uiGeolocate(context) {
             }
         } else {
             layer.enabled(null, false);
+            updateButtonState();
         }
         // This timeout ensures that we still call finish() even if
         // the user declines to share their location in Firefox
@@ -35,6 +39,7 @@ export function uiGeolocate(context) {
     function zoomTo() {
         var map = context.map();
         layer.enabled(_position, true);
+        updateButtonState();
         map.centerZoomEase(_extent.center(), Math.min(20, map.extentZoom(_extent)));
     }
 
@@ -56,10 +61,14 @@ export function uiGeolocate(context) {
         _timeoutID = undefined;
     }
 
+    function updateButtonState() {
+        _button.classed('active', layer.enabled());
+    }
+
     return function(selection) {
         if (!navigator.geolocation) return;
 
-        selection
+        _button = selection
             .append('button')
             .on('click', click)
             .call(svgIcon('#iD-icon-geolocate', 'light'))
diff --git a/modules/ui/init.js b/modules/ui/init.js
index 18a177b2d..a96cf7a72 100644
--- a/modules/ui/init.js
+++ b/modules/ui/init.js
@@ -125,7 +125,7 @@ export function uiInit(context) {
         uiPanes.forEach(function(pane) {
             controls
                 .append('div')
-                .attr('class', 'map-control ' + pane.id + '-control')
+                .attr('class', 'map-control map-pane-control ' + pane.id + '-control')
                 .call(pane.renderToggleButton);
         });
 
@@ -458,7 +458,7 @@ export function uiInit(context) {
         shownPanes
             .classed('shown', false);
 
-        d3_selectAll('.map-control button')
+        d3_selectAll('.map-pane-control button')
             .classed('active', false);
 
         if (showPane) {