       e.stopPropagation()
 
       # return early if we're opening a contextual menu (right click) during multi-select mode
-      if @multiSelectEnabled() and
-         entryToSelect.classList.contains('selected') and
-         # mouse right click or ctrl click as right click on darwin platforms
-         (e.button is 2 or e.ctrlKey and process.platform is 'darwin')
-        return
+      if @multiSelectEnabled() and entryToSelect.classList.contains('selected')
+
+        # mouse right click or ctrl click as right click on darwin platforms
+        if (e.button is 2 or e.ctrlKey and process.platform is 'darwin')
+          return
+        # stop unselect if dragging
+        else
+          @selectOnMouseUp = true
+          return
 
       if e.shiftKey
         @selectContinuousEntries(entryToSelect)


  # Handle entry name object dragstart event
  onDragStart: (e) ->
    if entry = e.target.closest('.entry')
      e.stopPropagation()


      else
        @selectEntry(entryToSelect)
        @showFullMenu()

  onMouseUp: (e) ->
    if @selectOnMouseUp
      @selectEntry(entryToSelect)
      @showFullMenu()

  # Public: Return an array of paths from all selected items
  #
