diff --git a/Common/Net/NetBuffer.cpp b/Common/Net/NetBuffer.cpp
index 00886bd95d..751a8c976d 100644
--- a/Common/Net/NetBuffer.cpp
+++ b/Common/Net/NetBuffer.cpp
@@ -122,7 +122,7 @@ bool Buffer::ReadAllWithProgress(int fd, int knownSize, RequestProgress *progres
 }
 
 int Buffer::Read(int fd, size_t sz) {
-	char buf[1024];
+	char buf[4096];
 	int retval;
 	size_t received = 0;
 	while ((retval = recv(fd, buf, std::min(sz, sizeof(buf)), MSG_NOSIGNAL)) > 0) {
diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp
index f8acfc6299..e0f0c03038 100644
--- a/UI/GamepadEmu.cpp
+++ b/UI/GamepadEmu.cpp
@@ -107,10 +107,12 @@ bool MultiTouchButton::Touch(const TouchInput &input) {
 		usedPointerMask |= 1 << input.id;
 	}
 	if (input.flags & TOUCH_MOVE) {
-		if (bounds_.Contains(input.x, input.y) && !(analogPointerMask & (1 << input.id)))
-			pointerDownMask_ |= 1 << input.id;
-		else
-			pointerDownMask_ &= ~(1 << input.id);
+		if (!(input.flags & TOUCH_MOUSE) || input.buttons) {
+			if (bounds_.Contains(input.x, input.y) && !(analogPointerMask & (1 << input.id)))
+				pointerDownMask_ |= 1 << input.id;
+			else
+				pointerDownMask_ &= ~(1 << input.id);
+		}
 	}
 	if (input.flags & TOUCH_UP) {
 		pointerDownMask_ &= ~(1 << input.id);
@@ -291,11 +293,13 @@ bool PSPDpad::Touch(const TouchInput &input) {
 		}
 	}
 	if (input.flags & TOUCH_MOVE) {
-		if (dragPointerId_ == -1 && bounds_.Contains(input.x, input.y) && !(analogPointerMask & (1 << input.id))) {
-			dragPointerId_ = input.id;
-		}
-		if (input.id == dragPointerId_) {
-			ProcessTouch(input.x, input.y, true);
+		if (!(input.flags & TOUCH_MOUSE) || input.buttons) {
+			if (dragPointerId_ == -1 && bounds_.Contains(input.x, input.y) && !(analogPointerMask & (1 << input.id))) {
+				dragPointerId_ = input.id;
+			}
+			if (input.id == dragPointerId_) {
+				ProcessTouch(input.x, input.y, true);
+			}
 		}
 	}
 	if (input.flags & TOUCH_UP) {