diff --git a/src/ts/app/components/PokemonSelectList/PokemonSelectList.tsx b/src/ts/app/components/PokemonSelectList/PokemonSelectList.tsx
index e7ac1f9..853c4ea 100644
--- a/src/ts/app/components/PokemonSelectList/PokemonSelectList.tsx
+++ b/src/ts/app/components/PokemonSelectList/PokemonSelectList.tsx
@@ -121,7 +121,7 @@ export class PokemonSelectList extends React.Component<IPokemonSelectListProps,
                             }
                         </Measure>
                     }
-                    { listLength === 0 &&
+                    { listLength === 0 && this.props.filterTerm !== '' &&
                         <div className={ styles.emptyState }>
                             <i className="pokemon-missing-no" />
                             <h3>{ DEFAULT_POKEMON_NAME }</h3>
@@ -160,7 +160,7 @@ export class PokemonSelectList extends React.Component<IPokemonSelectListProps,
         const onClick = () => this.props.handleActivatePokemon(pokemon.id, pokemon.form);
         return (
             <a
-                key={ index + pokemon.id }
+                key={ `${index}-${pokemon.id}-${pokemon.form}` }
                 style={ style }
                 className={ anchorCss }
                 onClick={ onClick }