       @items = [@promptItem, items...]
       @renderItems(items)
 
-      @selectItemForRow(@findRowForNormalItem(0, 'next'))
+      if (not selectFirstItem) and item = @findItem(@selectedItem)
+        @selectItem(item)
+      else
+        @selectFirstNormalItem()
 
       @setModifiedState(false)
       unless @hasNormalItem()

    @items.filter (item) ->
      (not item.skip) and (item.filePath is filePath)

  updateProviderPanel: (states) ->
    @providerPanel.updateStateElements(states)

  selectItemForRow: (row) ->
    item = @items[row]

            selection.destroy()
          @withIgnoreChange => @insertQuery(@lastQuery) # Recover query
        else
          @refresh(selectFirstItem: true).then =>
            if @autoPreviewOnQueryChange and @isActive()
              if @provider.boundToEditor
                @preview()
