diff --git a/shell.asm b/shell.asm
index 76f6b22..04fbd29 100644
--- a/shell.asm
+++ b/shell.asm
@@ -186,6 +186,11 @@ paint:
 mouse:
 	call get_window
 
+	test dl, MOUSE_PRIMARY | MOUSE_SECONDARY
+	jnz .any_buttons_held
+	mov byte [si + window.status], 0
+	.any_buttons_held:
+
 	mov ax, bx
 
 	push cx
@@ -232,7 +237,6 @@ mouse:
 		jmp .inside
 	.not_buttons_held:
 		mov byte [si + window.mouse_released_inside], 1
-		mov byte [si + window.status], 0
 
 	.inside:
 		pop cx