diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java
index 66e1e6b9..1c030fb7 100644
--- a/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java
+++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java
@@ -24,6 +24,10 @@ public class UIKit {
         switch (event) {
             case ACTION_DOWN:
             case ACTION_UP:
+                if (!GLFW.mGLFWIsGrabbing) {
+                    CallbackBridge.mouseX = x;
+                    CallbackBridge.mouseY = y;
+                }
                 CallbackBridge.mouseLastX = x;
                 CallbackBridge.mouseLastY = y;
                 break;
diff --git a/Natives/SurfaceViewController.m b/Natives/SurfaceViewController.m
index 3af16183..aa5b8d8d 100644
--- a/Natives/SurfaceViewController.m
+++ b/Natives/SurfaceViewController.m
@@ -75,6 +75,8 @@ UITextField *inputView;
 
     UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(surfaceOnClick:)];
     tapGesture.numberOfTapsRequired = 1;
+    tapGesture.numberOfTouchesRequired = 1;
+    tapGesture.cancelsTouchesInView = NO;
     [touchView addGestureRecognizer:tapGesture];
 
     UILongPressGestureRecognizer *longpressGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(surfaceOnLongpress:)];
@@ -150,10 +152,6 @@ UITextField *inputView;
 
 - (void)surfaceOnClick:(UITapGestureRecognizer *)sender {
     if (sender.state == UIGestureRecognizerStateRecognized) {
-        if (isGrabbing == JNI_FALSE) {
-            CGPoint locationInView = [sender locationInView:[sender.view superview]];
-            [self sendTouchPoint:locationInView withEvent:ACTION_MOVE];
-        }
         Java_org_lwjgl_glfw_CallbackBridge_nativeSendMouseButton(NULL, NULL,
             isGrabbing == JNI_TRUE ? GLFW_MOUSE_BUTTON_RIGHT : GLFW_MOUSE_BUTTON_LEFT, 1, 0);
         Java_org_lwjgl_glfw_CallbackBridge_nativeSendMouseButton(NULL, NULL,