diff --git a/windows/main.cpp b/windows/main.cpp
index 6d4054a5..5177a6d1 100644
--- a/windows/main.cpp
+++ b/windows/main.cpp
@@ -6,16 +6,19 @@ static HHOOK filter;
 static LRESULT CALLBACK filterProc(int code, WPARAM wParam, LPARAM lParam)
 {
 	MSG *msg = (MSG *) lParam;
-	BOOL discard;
 
 	if (code < 0)
 		goto callNext;
 
-	discard = !areaFilter(msg);
+	if (areaFilter(msg))		// don't continue to our IsDialogMessage() hack if the area handled it
+		goto discard;
 
-	if (discard)
-		goto callNext;
+	// TODO IsDialogMessage() hack here
 
+	// otherwise keep going
+	goto callNext;
+
+discard:
 	// we handled it; discard the message so the dialog manager doesn't see it
 	return 1;