     e.stopPropagation()
 
     if shiftKey and cmdKey
-      # select continuous from @lastFocusedElement but leave others
+      # select continuous from @lastFocusedEntry but leave others
       @selectContinuousEntries(entryToSelect, false)
-      @toggleMultiSelectMenu()
+      @showMultiSelectMenuIfNecessary()
     else if shiftKey
-      # select continuous from @lastFocusedElement and deselect rest
+      # select continuous from @lastFocusedEntry and deselect rest
       @selectContinuousEntries(entryToSelect)
-      @toggleMultiSelectMenu()
+      @showMultiSelectMenuIfNecessary()
     # only allow ctrl click for multi selection on non darwin systems
     else if cmdKey
       @deselect([entryToSelect])
-      @lastFocusedElement = entryToSelect
-      @toggleMultiSelectMenu()
+      @lastFocusedEntry = entryToSelect
+      @showMultiSelectMenuIfNecessary()
     else
       @selectEntry(entryToSelect)
       @showFullMenu()

  #
  # Returns array of selected elements
  selectContinuousEntries: (entry, deselectOthers = true) ->
    currentSelectedEntry = @lastFocusedElement ? @selectedEntry()
    parentContainer = entry.parentElement
    elements = []
    if parentContainer is currentSelectedEntry.parentElement

    @roots = []
    @selectedPath = null
    @selectOnMouseUp = null
    @lastFocusedEntry = null
    @ignoredPatterns = []
    @useSyncFS = false
    @currentlyOpening = new Map
