diff --git a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
index e2ba6d292..cbbc2fe5f 100644
--- a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
+++ b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
@@ -593,6 +593,7 @@ end
         oldindex = @index
         pbGoToPrevious
         if @index != oldindex
+          @selected_index=0
           pbUpdateDummyPokemon
           @available = pbGetAvailableForms
           pbSEStop
@@ -603,6 +604,7 @@ end
         oldindex = @index
         pbGoToNext
         if @index != oldindex
+          @selected_index=0
           pbUpdateDummyPokemon
           @available = pbGetAvailableForms
           pbSEStop
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 04449258f..15ae80e4d 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ