diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index 61c774e293..f3e1caf67d 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -122,7 +122,8 @@ inCommandShortcuts = {
     "AddHold":    ["Q",translate("draft","Add custom snap point"),None],
     "Length":     ["H",translate("draft","Length mode"),          "lengthValue"],
     "Wipe":       ["W",translate("draft","Wipe"),                 "wipeButton"],
-    "SetWP":      ["U",translate("draft","Set Working Plane"),    "orientWPButton"]
+    "SetWP":      ["U",translate("draft","Set Working Plane"), "orientWPButton"],
+    "CycleSnap":  [QtCore.Qt.Key_Tab,translate("draft","Cycle snap object"), None]
 }
 
 
@@ -274,7 +275,7 @@ class DraftBaseWidget(QtGui.QWidget):
     def __init__(self,parent = None):
         QtGui.QWidget.__init__(self,parent)
     def eventFilter(self, widget, event):
-        if event.type() == QtCore.QEvent.KeyPress and event.key()==QtCore.Qt.Key_Tab:
+        if event.type() == QtCore.QEvent.KeyPress and event.key()==inCommandShortcuts["CycleSnap"][0]:
             if hasattr(FreeCADGui,"Snapper"):
                 FreeCADGui.Snapper.cycleSnapObject()
             return True
@@ -1238,7 +1239,10 @@ class DraftToolBar:
                         first = False
                     else:
                         cmdstr += ", "
-                    cmdstr += v[0] + ":" + v[1]
+                    try:
+                        cmdstr += v[0] + ":" + v[1]
+                    except:
+                        pass
             FreeCAD.Console.PrintMessage(cmdstr+"\n\n")
 
     def checkLocal(self):