diff --git a/common/tool/tool_dispatcher.cpp b/common/tool/tool_dispatcher.cpp
index da052004ca..f84f8b524d 100644
--- a/common/tool/tool_dispatcher.cpp
+++ b/common/tool/tool_dispatcher.cpp
@@ -452,7 +452,7 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
     {
         wxWindow* holderWindow = dynamic_cast<wxWindow*>( m_toolMgr->GetToolHolder() );
 
-#if defined( _WIN32 )
+#if defined( _WIN32 ) || defined( __WXGTK__ )
         // Mouse events may trigger regardless of window status (windows feature)
         // However we need to avoid focus fighting (especially modals)
         if( holderWindow && KIPLATFORM::UI::IsWindowActive( holderWindow ) )
diff --git a/common/view/wx_view_controls.cpp b/common/view/wx_view_controls.cpp
index f8f8990821..8ad3039302 100644
--- a/common/view/wx_view_controls.cpp
+++ b/common/view/wx_view_controls.cpp
@@ -459,8 +459,8 @@ void WX_VIEW_CONTROLS::onEnter( wxMouseEvent& aEvent )
         return;
     }
 
-#if defined( _WIN32 )
-    // Win32 transmits mouse move and wheel events to all controls below the mouse regardless
+#if defined( _WIN32 ) || defined( __WXGTK__ )
+    // Win32 and some *nix WMs transmit mouse move and wheel events to all controls below the mouse regardless
     // of focus.  Forcing the focus here will cause the EDA FRAMES to immediately become the
     // top level active window.
     if( m_parentPanel->GetParent() != nullptr )