diff --git a/src/Tool.s b/src/Tool.s
index ded21ad..d5c5121 100644
--- a/src/Tool.s
+++ b/src/Tool.s
@@ -119,11 +119,16 @@ _GTERemoveSprite     MAC
                      UserTool  $1300+GTEToolNum
                      <<<
 ; Helper function to set the data back to the toolset default
-_SetDataBank    sep  #$20
-                lda  #^TileStore
-                pha
+;_SetDataBank    sep  #$20
+;                lda  #^TileStore
+;                pha
+;                plb
+;                rep  #$20
+;                rts
+
+_SetDataBank    pea  #>TileStore
+                plb
                 plb
-                rep  #$20
                 rts
 
 ; Do nothing when the tool set is installed