Index: /src/org/openstreetmap/josm/actions/AboutAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/AboutAction.java	(revision 161)
+++ /src/org/openstreetmap/josm/actions/AboutAction.java	(revision 162)
@@ -55,5 +55,5 @@
 
 	public AboutAction() {
-		super(tr("About"), "about",tr("Display the about screen."), KeyEvent.VK_A);
+		super(tr("About"), "about",tr("Display the about screen."), KeyEvent.VK_F1, KeyEvent.SHIFT_DOWN_MASK);
 	}
 
Index: /src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
===================================================================
--- /src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java	(revision 161)
+++ /src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java	(revision 162)
@@ -29,5 +29,5 @@
 
 	public CommandStackDialog(final MapFrame mapFrame) {
-		super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."), KeyEvent.VK_C, 100);
+		super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."), KeyEvent.VK_O, 100);
 		mapFrame.mapView.addLayerChangeListener(new LayerChangeListener(){
 			public void activeLayerChange(Layer oldLayer, Layer newLayer) {}