diff --git a/css/map.css b/css/map.css
index e585cc2f9..4161dc4d0 100644
--- a/css/map.css
+++ b/css/map.css
@@ -900,7 +900,7 @@ text.point {
         ) 9 9, auto;
 }
 
-#map:active {
+#map.panning {
     cursor: pointer; /* Opera */
     cursor: url(img/cursor-grabbing.png) 9 9, auto; /* FF */
     cursor: -webkit-image-set(
diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index 95e4e67f2..9756dd91e 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -181,6 +181,12 @@ iD.Map = function(context) {
 
         transformed = true;
         supersurface.style(transformProp, transform);
+
+        if (tX || tY) {
+            context.container().selectAll('#map')
+                .classed('panning', true);
+        }
+
         queueRedraw();
 
         dispatch.move(map);
@@ -189,6 +195,8 @@ iD.Map = function(context) {
     function resetTransform() {
         if (!transformed) return false;
         supersurface.style(transformProp, '');
+        context.container().selectAll('#map')
+            .classed('panning', false);
         transformed = false;
         return true;
     }