diff --git "a/src/main/java/workbench/gui/actions/WbAction.java" "b/src/main/java/workbench/gui/actions/WbAction.java"
index 0d31ecc7..dc7792d9 100644
--- "a/src/main/java/workbench/gui/actions/WbAction.java"
+++ "b/src/main/java/workbench/gui/actions/WbAction.java"
@@ -684,7 +684,7 @@ public class WbAction
 
   private String getAcceleratorDisplay()
   {
-    KeyStroke key = getDefaultAccelerator();
+	KeyStroke key = getAccelerator();
     if (key == null) return null;
 
     String acceleratorDelimiter = UIManager.getString("MenuItem.acceleratorDelimiter");
@@ -694,8 +694,15 @@ public class WbAction
     }
     int mod = key.getModifiers();
     int keycode = key.getKeyCode();
-
-    String display = KeyEvent.getKeyModifiersText(mod) + acceleratorDelimiter + KeyEvent.getKeyText(keycode);
+    
+    String display;
+    if(InputEvent.getModifiersExText(mod).equals("")) {
+    	display = KeyEvent.getKeyText(keycode);
+    }
+    else {
+    	display = InputEvent.getModifiersExText(mod)  + acceleratorDelimiter + KeyEvent.getKeyText(keycode);
+    }
+    
     return display;
   }