diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp
index 1545818335..c9f3c331b0 100644
--- a/common/hotkeys_basic.cpp
+++ b/common/hotkeys_basic.cpp
@@ -198,13 +198,22 @@ wxString AddHotkeyName( const wxString& aText, int aHotKey, HOTKEY_ACTION_TYPE a
         switch( aStyle )
         {
         case IS_HOTKEY:
-            msg << wxT( "\t" ) << keyname;
+        {
+            // Don't add a suffix for unassigned hotkeys:
+            // WX spews debug from wxAcceleratorEntry::ParseAccel if it doesn't
+            // recognise the keyname, which is the case for <unassigned>.
+            if( aHotKey != 0 )
+            {
+                msg << wxT( "\t" ) << keyname;
+            }
             break;
-
+        }
         case IS_COMMENT:
+        {
             msg << wxT( " (" ) << keyname << wxT( ")" );
             break;
         }
+        }
     }
 
 #ifdef USING_MAC_CMD
diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp
index ad3f732ba4..3a9dbee87f 100644
--- a/pcbnew/tools/drawing_tool.cpp
+++ b/pcbnew/tools/drawing_tool.cpp
@@ -125,7 +125,7 @@ TOOL_ACTION PCB_ACTIONS::drawZoneKeepout( "pcbnew.InteractiveDrawing.keepout",
 
 TOOL_ACTION PCB_ACTIONS::drawZoneCutout( "pcbnew.InteractiveDrawing.zoneCutout",
         AS_GLOBAL, 
-        GR_KB_SHIFT + 'C', LEGACY_HK_NAME( "Add a Zone Cutout" ),
+        MD_SHIFT + 'C', LEGACY_HK_NAME( "Add a Zone Cutout" ),
         _( "Add a Zone Cutout" ), _( "Add a cutout area of an existing zone" ),
         add_zone_cutout_xpm, AF_ACTIVATE );