diff --git a/client.cs b/client.cs
index ee22f44..63c6eac 100644
--- a/client.cs
+++ b/client.cs
@@ -10,7 +10,6 @@ $RPGClient::HelloPending = 0;
 $RPGClient::HelloLast = "";
 $RPGClient::TopDownWatchSched = 0;
 $RPGClient::CamSched = 0;
-$RPGClient::MoveMapHeld = 0;
 
 function RPGClient_NormPos(%ctrl, %pos)
 {
@@ -122,47 +121,37 @@ function RPGClient_EnableOverlay()
 	RPGClient_KeyMap.bind(keyboard0, "pagedown", RPGClient_ZoomOut);
 	RPGClient_KeyMap.bind(keyboard0, equals, RPGClient_ZoomIn);
 	RPGClient_KeyMap.bind(keyboard0, minus, RPGClient_ZoomOut);
-	Canvas.pushDialog(RPGClient_Mouse, 0);
+	RPGClient_KeyMap.bind(keyboard0, m, RPGClient_ToggleCursor);
 	RPGClient_KeyMap.push();
-	if (isObject(PlayGui) && isObject(Canvas) && Canvas.getContent() == PlayGui.getId() && isObject(moveMap) && !$RPGClient::MoveMapHeld)
-	{
-		moveMap.pop();
-		$RPGClient::MoveMapHeld = 1;
-	}
 	$mvFreeLook = 0;
 	$firstPerson = 0;
-	if (isObject(Canvas))
-	{
-		Canvas.cursorOn();
-	}
 	if (isObject(PlayGui))
 	{
 		PlayGui.killToolHud();
 	}
 }
 
+function RPGClient_ToggleCursor(%val)
+{
+	if (!$RPGClient::Active || !%val)
+	{
+		return;
+	}
+	ToggleCursor(%val);
+}
+
 function RPGClient_DisableOverlay()
 {
 	cancel($RPGClient::CamSched);
 	$RPGClient::CamSched = 0;
-	if ($RPGClient::MoveMapHeld && isObject(moveMap))
-	{
-		moveMap.push();
-		$RPGClient::MoveMapHeld = 0;
-	}
 	if (isObject(RPGClient_KeyMap))
 	{
 		RPGClient_KeyMap.pop();
 	}
 	if (isObject(RPGClient_Mouse))
 	{
-		Canvas.popDialog(RPGClient_Mouse);
 		RPGClient_Mouse.delete();
 	}
-	if (isObject(Canvas) && Canvas.isCursorOn())
-	{
-		Canvas.cursorOff();
-	}
 	$RPGClient::Active = 0;
 }