diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 5c51c2e88c..9bac13b60f 100644
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -212,8 +212,6 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                     wxFocusEvent event(wxEVT_KILL_FOCUS, thisWindow->GetId());
                     event.SetEventObject(thisWindow);
                     thisWindow->GetEventHandler()->ProcessEvent(event) ;
-                    if (thisWindow->MacIsUserPane())
-                        result = noErr;
                 }
                 else
                 {
@@ -231,9 +229,9 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                     wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
                     event.SetEventObject(thisWindow);
                     thisWindow->GetEventHandler()->ProcessEvent(event) ;
-                    if (thisWindow->MacIsUserPane())
-                        result = noErr;
                 }
+                if ( thisWindow->MacIsUserPane() )
+                    result = noErr ;
             }
             break ;
 #endif