diff --git a/Data/Scripts/021_Debug/009_Editor_TilesetEditor.rb b/Data/Scripts/021_Debug/009_Editor_TilesetEditor.rb
index 2471519de..7650c6125 100644
--- a/Data/Scripts/021_Debug/009_Editor_TilesetEditor.rb
+++ b/Data/Scripts/021_Debug/009_Editor_TilesetEditor.rb
@@ -101,9 +101,9 @@ class PokemonTilesetScene
     @x = 0
     @y = -TILE_SIZE
     @topy = -TILE_SIZE
+    height = @sprites["tileset"].bitmap.height
     pbUpdateTileset
     pbFadeInAndShow(@sprites)
-    height = @sprites["tileset"].bitmap.height
     ########
     loop do
       Graphics.update
@@ -161,6 +161,7 @@ class PokemonTilesetScene
           pbUpdateTileset
         when 2
           pbChooseTileset
+          height = @sprites["tileset"].bitmap.height
         end
       elsif Input.trigger?(Input::B)
         if pbConfirmMessage(_INTL("Save changes?"))