diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index a07de2807e..c01230933f 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -401,15 +401,17 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
                             palette_xpm );
 
     // Options (Preferences on WXMAC)
+
+#ifdef __WXMAC__
+	preferencesMenu->Append(wxID_PREFERENCES);
+#else
     ADD_MENUITEM_WITH_HELP( preferencesMenu,
                             wxID_PREFERENCES,
-#ifdef __WXMAC__
-                            _( "&Preferences..." ),
-#else
                             _( "&Options" ),
-#endif // __WXMAC__
                             _( "EESchema preferences" ),
                             preference_xpm );
+#endif // __WXMAC__
+
 
     // Language submenu
     wxGetApp().AddMenuLanguageList( preferencesMenu );
diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp
index de90913201..9929018f86 100644
--- a/gerbview/menubar.cpp
+++ b/gerbview/menubar.cpp
@@ -133,15 +133,17 @@ void GERBVIEW_FRAME::ReCreateMenuBar( void )
                             layers_manager_xpm );
 
     // Options (Preferences on WXMAC)
+
+#ifdef __WXMAC__
+	configMenu->Append(wxID_PREFERENCES);
+#else
     ADD_MENUITEM_WITH_HELP( configMenu,
                             wxID_PREFERENCES,
-#ifdef __WXMAC__
-                            _( "Preferences..." ),
-#else
                             _( "&Options" ),
-#endif // __WXMAC__
                             _( "Set options to draw items" ),
                             preference_xpm );
+#endif // __WXMAC__
+
 
     // Language submenu
     wxGetApp().AddMenuLanguageList( configMenu );
diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp
index 2523c40fdd..ef1ed380b6 100644
--- a/pcbnew/menubar_pcbframe.cpp
+++ b/pcbnew/menubar_pcbframe.cpp
@@ -497,17 +497,16 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     configmenu->Append( item );
 
     // General
-    item = new wxMenuItem( configmenu, wxID_PREFERENCES,
-
 #ifdef __WXMAC__
-                           _( "&Preferences..." ),
+	configmenu->Append(wxID_PREFERENCES);
 #else
+    item = new wxMenuItem( configmenu, wxID_PREFERENCES,
                            _( "&General" ),
-#endif
                            _( "Select general options for PCBnew" ) );
 
     SET_BITMAP( preference_xpm );
     configmenu->Append( item );
+#endif
 
     // Display
     item = new wxMenuItem( configmenu, ID_PCB_DISPLAY_OPTIONS_SETUP,