diff --git a/lib/views/staging-view.js b/lib/views/staging-view.js
index 875ea9b13d..1e378bf2e9 100644
--- a/lib/views/staging-view.js
+++ b/lib/views/staging-view.js
@@ -162,9 +162,11 @@ export default class StagingView {
   }
 
   mouseup () {
-    this.mouseSelectionInProgress = false
-    this.selection.coalesce()
-    this.onDidChangeSelectedItem()
+    if (this.mouseSelectionInProgress) {
+      this.mouseSelectionInProgress = false
+      this.selection.coalesce()
+      this.onDidChangeSelectedItem()
+    }
   }
 
   render () {