diff --git a/src/modes/simple_select.js b/src/modes/simple_select.js
index 6687c8185..ff8b5bcc3 100644
--- a/src/modes/simple_select.js
+++ b/src/modes/simple_select.js
@@ -86,7 +86,7 @@ SimpleSelect.stopExtendedInteractions = function(state) {
     state.boxSelectElement = null;
   }
 
-  if (state.initialDragPanState !== false) {
+  if ((state.canDragMove || state.canBoxSelect) && state.initialDragPanState === true) {
     this.map.dragPan.enable();
   }