diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index b4ec9cf526..c911738e83 100644
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -257,13 +257,13 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
     // otherwise everything else breaks down
     m_focus = FindFocus();
     if ( m_focus )
+#endif // __WXMSW__
     {
         delete m_handlerFocus;
         m_handlerFocus = new wxPopupFocusHandler(this);
 
         m_focus->PushEventHandler(m_handlerFocus);
     }
-#endif // __WXMSW__
 }
 
 void wxPopupTransientWindow::Dismiss()