diff --git a/packs/guikit-datapack/data/guikit/function/internal/follow.mcfunction b/packs/guikit-datapack/data/guikit/function/internal/follow.mcfunction
index 48785dce..57d54c8e 100644
--- a/packs/guikit-datapack/data/guikit/function/internal/follow.mcfunction
+++ b/packs/guikit-datapack/data/guikit/function/internal/follow.mcfunction
@@ -2,4 +2,4 @@
 # Position context: tick_player runs `at @s` (the player). `execute as <cart>` does NOT
 # change the position, so `tp @s ~ ~ ~` moves the cart exactly onto its owner.
 scoreboard players set #found guikit.tmp 1
-tp @s ~ ~1 ~
+tp @s[type=minecraft:chest_minecart] ~ ~1 ~
diff --git a/packs/guikit-demo/data/demo/function/click/open_chest_boat.mcfunction b/packs/guikit-demo/data/demo/function/click/open_chest_boat.mcfunction
index d6f5a318..699a85fd 100644
--- a/packs/guikit-demo/data/demo/function/click/open_chest_boat.mcfunction
+++ b/packs/guikit-demo/data/demo/function/click/open_chest_boat.mcfunction
@@ -2,3 +2,4 @@
 function guikit:internal/clear_in
 data merge storage guikit:in {menu:"demo:chest_boat_demo", page:0, timer:600}
 function guikit:api/open
+ride @s mount @e[type=#guikit:container,tag=guikit.cart,sort=nearest,limit=1,distance=..2.4]