diff -r 0845ad557b48 form/src/org/netbeans/modules/form/resources/templates/Dialogs/Application_java
--- a/form/src/org/netbeans/modules/form/resources/templates/Dialogs/Application_java	Fri Jan 21 06:24:05 2011 +0300
+++ b/form/src/org/netbeans/modules/form/resources/templates/Dialogs/Application_java	Fri Jan 21 16:19:53 2011 +0100
@@ -49,14 +49,15 @@
         aboutMenuItem = new javax.swing.JMenuItem();
 
         setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
-        fileMenu.setText("File");
-        openMenuItem.setText("Open");
+
+        fileMenu.setText("&File");
+        openMenuItem.setText("&Open");
         fileMenu.add(openMenuItem);
-        saveMenuItem.setText("Save");
+        saveMenuItem.setText("&Save");
         fileMenu.add(saveMenuItem);
-        saveAsMenuItem.setText("Save As ...");
+        saveAsMenuItem.setText("Save &As ...");
         fileMenu.add(saveAsMenuItem);
-        exitMenuItem.setText("Exit");
+        exitMenuItem.setText("E&xit");
         exitMenuItem.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 exitMenuItemActionPerformed(evt);
@@ -65,20 +66,20 @@
 
         fileMenu.add(exitMenuItem);
         menuBar.add(fileMenu);
-        editMenu.setText("Edit");
-        cutMenuItem.setText("Cut");
+        editMenu.setText("&Edit");
+        cutMenuItem.setText("Cu&t");
         editMenu.add(cutMenuItem);
-        copyMenuItem.setText("Copy");
+        copyMenuItem.setText("Cop&y");
         editMenu.add(copyMenuItem);
-        pasteMenuItem.setText("Paste");
+        pasteMenuItem.setText("&Paste");
         editMenu.add(pasteMenuItem);
-        deleteMenuItem.setText("Delete");
+        deleteMenuItem.setText("&Delete");
         editMenu.add(deleteMenuItem);
         menuBar.add(editMenu);
-        helpMenu.setText("Help");
-        contentsMenuItem.setText("Contents");
+        helpMenu.setText("&Help");
+        contentsMenuItem.setText("&Contents");
         helpMenu.add(contentsMenuItem);
-        aboutMenuItem.setText("About");
+        aboutMenuItem.setText("&About");
         helpMenu.add(aboutMenuItem);
         menuBar.add(helpMenu);
         setJMenuBar(menuBar);
diff -r 0845ad557b48 form/src/org/netbeans/modules/form/resources/templates/Dialogs/MDIApplication_java
--- a/form/src/org/netbeans/modules/form/resources/templates/Dialogs/MDIApplication_java	Fri Jan 21 06:24:05 2011 +0300
+++ b/form/src/org/netbeans/modules/form/resources/templates/Dialogs/MDIApplication_java	Fri Jan 21 16:19:53 2011 +0100
@@ -51,14 +51,14 @@
 
         setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
 
-        fileMenu.setText("File");
-        openMenuItem.setText("Open");
+        fileMenu.setText("&File");
+        openMenuItem.setText("&Open");
         fileMenu.add(openMenuItem);
-        saveMenuItem.setText("Save");
+        saveMenuItem.setText("&Save");
         fileMenu.add(saveMenuItem);
-        saveAsMenuItem.setText("Save As ...");
+        saveAsMenuItem.setText("Save &As ...");
         fileMenu.add(saveAsMenuItem);
-        exitMenuItem.setText("Exit");
+        exitMenuItem.setText("E&xit");
         exitMenuItem.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 exitMenuItemActionPerformed(evt);
@@ -67,20 +67,20 @@
 
         fileMenu.add(exitMenuItem);
         menuBar.add(fileMenu);
-        editMenu.setText("Edit");
-        cutMenuItem.setText("Cut");
+        editMenu.setText("&Edit");
+        cutMenuItem.setText("Cu&t");
         editMenu.add(cutMenuItem);
-        copyMenuItem.setText("Copy");
+        copyMenuItem.setText("Cop&y");
         editMenu.add(copyMenuItem);
-        pasteMenuItem.setText("Paste");
+        pasteMenuItem.setText("&Paste");
         editMenu.add(pasteMenuItem);
-        deleteMenuItem.setText("Delete");
+        deleteMenuItem.setText("&Delete");
         editMenu.add(deleteMenuItem);
         menuBar.add(editMenu);
-        helpMenu.setText("Help");
-        contentMenuItem.setText("Contents");
+        helpMenu.setText("&Help");
+        contentMenuItem.setText("&Contents");
         helpMenu.add(contentMenuItem);
-        aboutMenuItem.setText("About");
+        aboutMenuItem.setText("&About");
         helpMenu.add(aboutMenuItem);
         menuBar.add(helpMenu);
         setJMenuBar(menuBar);
diff -r 0845ad557b48 form/src/org/netbeans/modules/form/resources/templates/Dialogs/OkCancelDialog_java
--- a/form/src/org/netbeans/modules/form/resources/templates/Dialogs/OkCancelDialog_java	Fri Jan 21 06:24:05 2011 +0300
+++ b/form/src/org/netbeans/modules/form/resources/templates/Dialogs/OkCancelDialog_java	Fri Jan 21 16:19:53 2011 +0100
@@ -58,6 +58,7 @@
                 okButtonActionPerformed(evt);
             }
         });
+        getRootPane().setDefaultButton(okButton);
 
         cancelButton.setText("Cancel");
         cancelButton.addActionListener(new java.awt.event.ActionListener() {
@@ -66,6 +67,20 @@
             }
         });
 
+        javax.swing.Action cancelKeyAction = new javax.swing.AbstractAction("Cancel") {
+            public void actionPerformed(java.awt.event.ActionEvent e) {
+                doClose(RET_CANCEL);
+            }
+        };
+        cancelButton.setAction(cancelKeyAction);
+        String cancelName = "cancel";
+        javax.swing.InputMap inputMap =
+                getRootPane().getInputMap(javax.swing.JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+        javax.swing.ActionMap actionMap = getRootPane().getActionMap();
+        javax.swing.KeyStroke cancelKeyStroke = javax.swing.KeyStroke.getKeyStroke((char) java.awt.event.KeyEvent.VK_ESCAPE, 0);
+        inputMap.put(cancelKeyStroke, cancelName);
+        actionMap.put(cancelName, cancelKeyAction);
+
         org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
         layout.setHorizontalGroup(