diff --git a/src/ClassiCube.vcxproj b/src/ClassiCube.vcxproj
index da53da6ab..0ab4d2c52 100644
--- a/src/ClassiCube.vcxproj
+++ b/src/ClassiCube.vcxproj
@@ -547,6 +547,7 @@
     <ClCompile Include="String.c" />
     <ClCompile Include="SystemFonts.c" />
     <ClCompile Include="TexturePack.c" />
+    <ClCompile Include="TouchUI.c" />
     <ClCompile Include="Utils.c" />
     <ClCompile Include="Vectors.c" />
     <ClCompile Include="Vorbis.c" />
diff --git a/src/ClassiCube.vcxproj.filters b/src/ClassiCube.vcxproj.filters
index 7b4483312..8ce44dba7 100644
--- a/src/ClassiCube.vcxproj.filters
+++ b/src/ClassiCube.vcxproj.filters
@@ -782,6 +782,9 @@
     <ClCompile Include="Platform_Saturn.c">
       <Filter>Source Files\Platform</Filter>
     </ClCompile>
+    <ClCompile Include="TouchUI.c">
+      <Filter>Source Files\2D</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\misc\windows\CCicon.rc">
diff --git a/src/TouchUI.c b/src/TouchUI.c
index 3dab6ab46..00740cd6e 100644
--- a/src/TouchUI.c
+++ b/src/TouchUI.c
@@ -519,11 +519,11 @@ static struct Widget* touch_widgets[ONSCREEN_MAX_BTNS + TOUCH_EXTRA_BTNS + 2] =
 #define TOUCH_MAX_VERTICES (THUMBSTICKWIDGET_MAX + TOUCH_MAX_BTNS * BUTTONWIDGET_MAX)
 
 static void TouchScreen_ChatClick(void* s,     void* w) { ChatScreen_OpenInput(&String_Empty); }
-static void TouchScreen_RespawnClick(void* s,  void* w) { LocalPlayer_HandleRespawn(Entities.CurPlayer); }
-static void TouchScreen_SetSpawnClick(void* s, void* w) { LocalPlayer_HandleSetSpawn(Entities.CurPlayer); }
-static void TouchScreen_FlyClick(void* s,      void* w) { LocalPlayer_HandleFly(Entities.CurPlayer); }
-static void TouchScreen_NoclipClick(void* s,   void* w) { LocalPlayer_HandleNoclip(Entities.CurPlayer); }
-static void TouchScreen_CameraClick(void* s,   void* w) { Camera_CycleActive(); }
+static void TouchScreen_RespawnClick(void* s,  void* w) { Bind_OnTriggered[BIND_RESPAWN](0); }
+static void TouchScreen_SetSpawnClick(void* s, void* w) { Bind_OnTriggered[BIND_SET_SPAWN](0); }
+static void TouchScreen_FlyClick(void* s,      void* w) { Bind_OnTriggered[BIND_FLY](0); }
+static void TouchScreen_NoclipClick(void* s,   void* w) { Bind_OnTriggered[BIND_NOCLIP](0); }
+static void TouchScreen_CameraClick(void* s,   void* w) { Bind_OnTriggered[BIND_THIRD_PERSON](0); }
 static void TouchScreen_MoreClick(void* s,     void* w) { TouchMoreScreen_Show(); }
 static void TouchScreen_SwitchClick(void* s,   void* w) { Inventory_SwitchHotbar(); }
 static void TouchScreen_DeleteClick(void* s,   void* w) { InputHandler_DeleteBlock(); } /* TODO: also Send CPEClick packet */