diff --git a/pcbnew/grid_layer_box_helpers.cpp b/pcbnew/grid_layer_box_helpers.cpp
index 6977630ee3..09f59876a4 100644
--- a/pcbnew/grid_layer_box_helpers.cpp
+++ b/pcbnew/grid_layer_box_helpers.cpp
@@ -201,11 +201,14 @@ void GRID_CELL_LAYER_SELECTOR::Reset()
 
 void GRID_CELL_LAYER_SELECTOR::onComboDropDown( wxCommandEvent& aEvent )
 {
+    // On other platforms this is done in BeginEdit()
+#if defined(__WXGTK20__)
     auto evtHandler = static_cast<wxGridCellEditorEvtHandler*>( m_control->GetEventHandler() );
 
     // Once the combobox is dropped, reset the flag to allow the focus-loss handler
     // to function and close the editor.
     evtHandler->SetInSetFocus( false );
+#endif
 }