diff --git a/DeskUI/wwwroot/drag.js b/DeskUI/wwwroot/drag.js
index fd6ce21..3c94790 100644
--- a/DeskUI/wwwroot/drag.js
+++ b/DeskUI/wwwroot/drag.js
@@ -1,5 +1,16 @@
-window.trackPointerMove = function (dotnetRef) {
-    window.addEventListener('pointermove', e => {
-        dotnetRef.invokeMethodAsync('HandleMouseMoveAsync', e.clientX, e.clientY);
-    });
+window.trackPointerMove = (dotnet) => {
+    let dragging = false;
+
+    window.onpointerdown = e => {
+        dragging = true;
+    };
+
+    window.onpointermove = e => {
+        if (dragging)
+            dotnet.invokeMethodAsync('HandleMouseMoveAsync', e.clientX, e.clientY);
+    };
+
+    window.onpointerup = e => {
+        dragging = false;
+    };
 };