diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp
index 9ae00a78f..d3b2b04ef 100644
--- a/src/slic3r/GUI/KBShortcutsDialog.cpp
+++ b/src/slic3r/GUI/KBShortcutsDialog.cpp
@@ -195,8 +195,13 @@ void KBShortcutsDialog::fill_shortcuts()
             #else
                 { ctrl + "P", L("Preferences") },
             #endif
-            //3D control
+            //3D control, for Apple, use Cmd-Shift-M instead of Ctrl/Cmd-M due
+            #ifndef __APPLE__
+            { ctrl + "Shift+M", L("Show/Hide 3Dconnexion devices settings dialog") },
+            #else
             { ctrl + "M", L("Show/Hide 3Dconnexion devices settings dialog") },
+            #endif
+
             // Switch table page
             #ifndef __APPLE__
                 { ctrl + "Tab", L("Switch tab page")},
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index c5a3a147f..752bf6134 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -611,7 +611,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_
         if (evt.CmdDown() && (evt.GetKeyCode() == 'H')) {
             //call parent_menu hide behavior
             return;}
-        if (evt.CmdDown() && (evt.GetKeyCode() == 'M')) {
+        if (evt.CmdDown() && !evt.ShiftDown() && (evt.GetKeyCode() == 'M')) {
             this->Iconize();
             return;
         }