       teamJSON = JSON.parse(teamJSON)
       @collection.reset(teamJSON)
     else
-      @addEmptyPokemon()
+      @addNewPokemon()
 
   addEmptyPokemon: =>
     @collection.add(new Pokemon())
+
+  addNewPokemon: =>
+    @addEmptyPokemon()
+    @$('.pokemon_list li').last().click()
 
   saveTeam: =>
     teamJSON = @collection.toJSON()

        @filterMovesBy(moveName)

  filterMovesBy: (moveName) =>
    $table = @$('.table-moves')
    $allMoves = $table.find('tbody tr')
    moveRegex = new RegExp(moveName, "i")
    $moves = $allMoves.filter ->

    @listenTo(@collection, 'add remove', @renderPokemonList)

    @loadTeam()

    @render()

  clickPokemon: (ev) =>
    $listItem = $(ev.target)
    index = @$('.pokemon_list li').index($listItem)
    @setSelectedIndex(index)

  loadTeam: =>
