diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 0183d8f484..06a3c05fea 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -465,6 +465,12 @@ ARDOUR_UI::install_actions ()
 			hide_return (sigc::bind (sigc::mem_fun(*editor, &PublicEditor::export_video), false)));
 	ActionManager::session_sensitive_actions.push_back (act);
 
+
+#ifdef __APPLE__
+	act = ActionManager::register_action (main_actions, X_("MainWindow"), _("Main Window"),  sigc::mem_fun(*this, &ARDOUR_UI::goto_editor_window));
+    ActionManager::session_sensitive_actions.push_back (act);
+#endif
+    
 	ActionManager::register_action (main_actions, X_("LockSession"), _("Lock this session"),  sigc::mem_fun(*this, &ARDOUR_UI::on_lock_button_pressed));
 	ActionManager::register_action (main_actions, X_("ToggleMultiOutMode"), "Multi Out", sigc::mem_fun(*this, &ARDOUR_UI::toggle_multi_out_mode));
 	ActionManager::register_action (main_actions, X_("ToggleStereoOutMode"), "Stereo Out", sigc::mem_fun(*this, &ARDOUR_UI::toggle_stereo_out_mode));
diff --git a/gtk2_ardour/trackslive.menus.in b/gtk2_ardour/trackslive.menus.in
index 705849f1a5..f13236c1b8 100644
--- a/gtk2_ardour/trackslive.menus.in
+++ b/gtk2_ardour/trackslive.menus.in
@@ -83,7 +83,7 @@
       </menu>	   
       <separator/>
       <menuitem action='editor-delete'/>
-      <menuitem action='editor-crop'/>
+      <menuitem action='crop'/>
       <menuitem action='split-region'/>
       <separator/>
 #ifndef GTKOSX
@@ -134,6 +134,9 @@
       <menuitem action='show-editor-mixer'/>
     </menu>
     <menu action = 'WindowMenu'>
+#ifdef GTKOSX
+      <menuitem action='MainWindow'/>
+#endif
       <menuitem action='toggle-tracks-control-panel'/>
       <menuitem action='toggle-mixer'/>
       <menuitem action='toggle-meterbridge'/>