diff --git a/common/widgets/layer_box_selector.cpp b/common/widgets/layer_box_selector.cpp
index 23c6b177b3..e927a5e979 100644
--- a/common/widgets/layer_box_selector.cpp
+++ b/common/widgets/layer_box_selector.cpp
@@ -166,8 +166,13 @@ void LAYER_BOX_SELECTOR::ResyncBitmapOnly()
 
 void LAYER_BOX_SELECTOR::onKeyDown( wxKeyEvent& aEvent )
 {
+#ifdef __WXOSX_MAC__
     if( aEvent.GetKeyCode() == WXK_ESCAPE && IsPopupShown() )
+    {
         Dismiss();
-    else
-        aEvent.Skip();
+        return;
+    }
+#endif
+
+    aEvent.Skip();
 }