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

        {row} = @editor.getCursorBufferPosition()
        @editor.setCursorBufferPosition([row, column])

  refresh: ({force}={}) ->
    @emitWillRefresh()

    if force

      @items = [@promptItem, items...]
      @renderItems(items)

      if (not selectFirstItem) and item = @findItem(@selectedItem)
        @selectItem(item)
      else
        @selectFirstNormalItem()

      @setModifiedState(false)
      unless @hasNormalItem()
