diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 77da32475c..8eb151e595 100644
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -1270,7 +1270,16 @@ void wxApp::MacHandleMouseUpEvent( WXEVENTREF evr )
     EventRecord* ev = (EventRecord*) evr ;
     WindowRef window;
 
-    short windowPart = ::FindWindow(ev->where, &window);
+    short windowPart = inNoWindow ;
+	if ( wxTheApp->s_captureWindow )
+	{
+		window = (WindowRef) s_captureWindow->MacGetRootWindow() ;
+		windowPart = inContent ;
+	} 
+	else
+	{
+		windowPart = ::FindWindow(ev->where, &window) ;
+	}
 
     switch (windowPart)
     {
diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 77da32475c..8eb151e595 100644
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -1270,7 +1270,16 @@ void wxApp::MacHandleMouseUpEvent( WXEVENTREF evr )
     EventRecord* ev = (EventRecord*) evr ;
     WindowRef window;
 
-    short windowPart = ::FindWindow(ev->where, &window);
+    short windowPart = inNoWindow ;
+	if ( wxTheApp->s_captureWindow )
+	{
+		window = (WindowRef) s_captureWindow->MacGetRootWindow() ;
+		windowPart = inContent ;
+	} 
+	else
+	{
+		windowPart = ::FindWindow(ev->where, &window) ;
+	}
 
     switch (windowPart)
     {