diff --git a/public/js/crop_editor.js b/public/js/crop_editor.js
index 7ab1628d..5ddd64ac 100644
--- a/public/js/crop_editor.js
+++ b/public/js/crop_editor.js
@@ -224,9 +224,18 @@ class CropEditor {
 		if (this.isMoving) {
 			return false;
 		}
+
+		let dragStartX = event.x - this.image_container.offsetLeft;
+		let dragStartY = event.y - this.image_container.offsetTop;
+
+		if (dragStartX > this.original_image.clientWidth ||
+			dragStartY > this.original_image.clientHeight) {
+			return;
+		}
+
 		this.isDragging = true;
-		this.dragStartX = event.x - this.image_container.offsetLeft;
-		this.dragStartY = event.y - this.image_container.offsetTop;
+		this.dragStartX = dragStartX;
+		this.dragStartY = dragStartY;
 	}
 
 	cropSelectionEnd(event) {