diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c
index 9cca42f733..29326d29e7 100644
--- a/src/gnome-utils/gnc-main-window.c
+++ b/src/gnome-utils/gnc-main-window.c
@@ -3452,6 +3452,8 @@ gnc_quartz_set_menu(GncMainWindow* window)
         menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
     gtk_widget_hide(menu);
     gtk_osxapplication_set_menu_bar (theApp, GTK_MENU_SHELL (menu));
+    if (gtk_osxapplication_use_quartz_accelerators(theApp))
+	gtk_osxapplication_set_use_quartz_accelerators(theApp, FALSE);
 
     item = gtk_ui_manager_get_widget (window->ui_merge,
                                       "/menubar/File/FileQuit");
@@ -3483,7 +3485,7 @@ gnc_quartz_set_menu(GncMainWindow* window)
                                       "/menubar/Windows");
     gtk_osxapplication_set_window_menu(theApp, GTK_MENU_ITEM(item));
     g_signal_connect(theApp, "NSApplicationBlockTermination",
-                     G_CALLBACK(gtk_quartz_should_quit), window);
+                     G_CALLBACK(gnc_quartz_should_quit), window);
 
 }
 #endif //MAC_INTEGRATION
diff --git a/src/gnome-utils/ui/osx_accel_map b/src/gnome-utils/ui/osx_accel_map
index 4793007df3..1ecb7ab466 100644
--- a/src/gnome-utils/ui/osx_accel_map
+++ b/src/gnome-utils/ui/osx_accel_map
@@ -211,7 +211,7 @@
 ; (gtk_accel_path "<Actions>/MenuAdditions/CashFlowAction" "")
 ; (gtk_accel_path "<Actions>/MainWindowActions/FileImportAction" "")
 ; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/CustomerNewCustomerOpenAction" "")
-; (gtk_accel_path "<Actions>/MainWindowActions/FileQuitAction" "<Alt>q")
+ (gtk_accel_path "<Actions>/MainWindowActions/FileQuitAction" "<Meta>q")
 ; (gtk_accel_path "<Actions>/gnc-plugin-business-actions/TaxTablesOpenAction" "")
 ; (gtk_accel_path "<Actions>/MenuAdditions/AssetPiechartAction" "")
 ; (gtk_accel_path "<Actions>/MenuAdditions/SampleReportwithExamplesAction" "")