diff --git a/P3D/Pokemon/Items/Standard/EscapeRope.vb b/P3D/Pokemon/Items/Standard/EscapeRope.vb
index 3ee61672e..2c4391e0c 100644
--- a/P3D/Pokemon/Items/Standard/EscapeRope.vb
+++ b/P3D/Pokemon/Items/Standard/EscapeRope.vb
@@ -53,6 +53,14 @@ Namespace Items.Standard
 :end"
 
                 CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2)
+                If Screen.Level.Surfing = True Then
+                    Screen.Level.Surfing = False
+                    Screen.Level.OwnPlayer.SetTexture(Core.Player.TempSurfSkin, True)
+                    Core.Player.Skin = Core.Player.TempSurfSkin
+
+                    Screen.Level.OverworldPokemon.warped = True
+                    Screen.Level.OverworldPokemon.Visible = False
+                End If
             Else
                 Screen.TextBox.Show("Cannot use the Escape~Rope here!", {}, True, True)
             End If
diff --git a/P3D/Screens/Pokemon/PartyScreen.vb b/P3D/Screens/Pokemon/PartyScreen.vb
index f725ab129..f45dfe4f3 100644
--- a/P3D/Screens/Pokemon/PartyScreen.vb
+++ b/P3D/Screens/Pokemon/PartyScreen.vb
@@ -1053,6 +1053,14 @@ Public Class PartyScreen
 
             PlayerStatistics.Track("Dig used", 1)
             CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2)
+            If Screen.Level.Surfing = True Then
+                Screen.Level.Surfing = False
+                Screen.Level.OwnPlayer.SetTexture(Core.Player.TempSurfSkin, True)
+                Core.Player.Skin = Core.Player.TempSurfSkin
+
+                Screen.Level.OverworldPokemon.warped = True
+                Screen.Level.OverworldPokemon.Visible = False
+            End If
         Else
             TextBox.Show("Cannot use Dig here.", {}, True, False)
         End If
@@ -1098,6 +1106,14 @@ Public Class PartyScreen
 
             PlayerStatistics.Track("Teleport used", 1)
             CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2)
+            If Screen.Level.Surfing = True Then
+                Screen.Level.Surfing = False
+                Screen.Level.OwnPlayer.SetTexture(Core.Player.TempSurfSkin, True)
+                Core.Player.Skin = Core.Player.TempSurfSkin
+
+                Screen.Level.OverworldPokemon.warped = True
+                Screen.Level.OverworldPokemon.Visible = False
+            End If
         Else
             TextBox.Show("Cannot use Teleport here.", {}, True, False)
         End If