diff --git a/uk/ac/sanger/artemis/components/AddMenu.java b/uk/ac/sanger/artemis/components/AddMenu.java
index 92df3f43b707ce5593468a9cde801beb880db916..1d347135ebfe76add9d1d9a15ddda57ad913c895 100644
--- a/uk/ac/sanger/artemis/components/AddMenu.java
+++ b/uk/ac/sanger/artemis/components/AddMenu.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/AddMenu.java,v 1.12 2005-11-10 14:29:14 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/AddMenu.java,v 1.13 2006-01-17 16:05:05 tjc Exp $
  */
 
 package uk.ac.sanger.artemis.components;
@@ -54,7 +54,7 @@ import javax.swing.*;
  *  should have been called CreateMenu.
  *
  *  @author Kim Rutherford
- *  @version $Id: AddMenu.java,v 1.12 2005-11-10 14:29:14 tjc Exp $
+ *  @version $Id: AddMenu.java,v 1.13 2006-01-17 16:05:05 tjc Exp $
  **/
 public class AddMenu extends SelectionMenu 
 {
@@ -62,7 +62,8 @@ public class AddMenu extends SelectionMenu
    *  The shortcut for "Create From Base Range".
    **/
   final static KeyStroke CREATE_FROM_BASE_RANGE_KEY =
-    KeyStroke.getKeyStroke (KeyEvent.VK_C, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke (KeyEvent.VK_C,
+                            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
 
   final static public int CREATE_FROM_BASE_RANGE_KEY_CODE = KeyEvent.VK_C;
 
diff --git a/uk/ac/sanger/artemis/components/EditMenu.java b/uk/ac/sanger/artemis/components/EditMenu.java
index 60c3f698999a2ecb81d279c6a9d64ec0c2549331..08ea186f0e2d99c28c92c9cd321bba03c1a86ac1 100644
--- a/uk/ac/sanger/artemis/components/EditMenu.java
+++ b/uk/ac/sanger/artemis/components/EditMenu.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/EditMenu.java,v 1.14 2006-01-16 10:01:01 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/EditMenu.java,v 1.15 2006-01-17 16:05:05 tjc Exp $
  **/
 
 package uk.ac.sanger.artemis.components;
@@ -54,7 +54,7 @@ import java.util.Vector;
  *  A menu with editing commands.
  *
  *  @author Kim Rutherford
- *  @version $Id: EditMenu.java,v 1.14 2006-01-16 10:01:01 tjc Exp $
+ *  @version $Id: EditMenu.java,v 1.15 2006-01-17 16:05:05 tjc Exp $
  **/
 
 public class EditMenu extends SelectionMenu
@@ -139,42 +139,48 @@ public class EditMenu extends SelectionMenu
    *  The shortcut for Edit Selected Features.
    **/
   final static KeyStroke EDIT_FEATURES_KEY =
-    KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke(KeyEvent.VK_E, 
+                           Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
   final static public int EDIT_FEATURES_KEY_CODE = KeyEvent.VK_E;
 
   /**
    *  The shortcut for Merge Selected Features.
    **/
   final static KeyStroke MERGE_FEATURES_KEY =
-    KeyStroke.getKeyStroke(KeyEvent.VK_M, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke(KeyEvent.VK_M,
+                           Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); // InputEvent.CTRL_MASK);
   final static public int MERGE_FEATURES_KEY_CODE = KeyEvent.VK_M;
 
   /**
    *  The shortcut for Duplicate Selected Features.
    **/
   final static KeyStroke DUPLICATE_KEY =
-    KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke(KeyEvent.VK_D,
+                           Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); // InputEvent.CTRL_MASK);
   final static public int DUPLICATE_KEY_CODE = KeyEvent.VK_D;
 
   /**
    *  The shortcut for Delete Selected Features.
    **/
   final static KeyStroke DELETE_FEATURES_KEY =
-    KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke(KeyEvent.VK_DELETE,
+                           Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); // InputEvent.CTRL_MASK);
   final static public int DELETE_FEATURES_KEY_CODE = KeyEvent.VK_DELETE;
 
   /**
    *  The shortcut for Trim Selected Features.
    **/
   final static KeyStroke TRIM_FEATURES_KEY =
-    KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke(KeyEvent.VK_T,
+                           Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); // InputEvent.CTRL_MASK);
   final static public int TRIM_FEATURES_KEY_CODE = KeyEvent.VK_T;
 
   /**
    *  The shortcut for Trim Selected Features To Next Any.
    **/
   final static KeyStroke TRIM_FEATURES_TO_NEXT_ANY_KEY =
-    KeyStroke.getKeyStroke(KeyEvent.VK_Y, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke(KeyEvent.VK_Y,
+                           Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); // InputEvent.CTRL_MASK);
   final static public int TRIM_FEATURES_TO_NEXT_ANY_KEY_CODE = KeyEvent.VK_Y;
 
   /**
@@ -190,7 +196,8 @@ public class EditMenu extends SelectionMenu
    **/
   final static public int UNDO_KEY_CODE = KeyEvent.VK_U;
   final static KeyStroke UNDO_KEY =
-    KeyStroke.getKeyStroke(UNDO_KEY_CODE, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke(UNDO_KEY_CODE,
+                           Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); // InputEvent.CTRL_MASK);
 
   /**
    *  Implementation of the EntryGroupChangeListener interface.  We listen to
diff --git a/uk/ac/sanger/artemis/components/EntryEdit.java b/uk/ac/sanger/artemis/components/EntryEdit.java
index 0276ce1bd62ec08cae80feb68cccb903e5152cf6..535160cf2d692b03b6e87d73460ede3e8df091c1 100644
--- a/uk/ac/sanger/artemis/components/EntryEdit.java
+++ b/uk/ac/sanger/artemis/components/EntryEdit.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/EntryEdit.java,v 1.24 2006-01-17 15:49:37 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/EntryEdit.java,v 1.25 2006-01-17 16:05:05 tjc Exp $
  */
 
 package uk.ac.sanger.artemis.components;
@@ -61,7 +61,7 @@ import javax.swing.border.BevelBorder;
  *  Each object of this class is used to edit an EntryGroup object.
  *
  *  @author Kim Rutherford
- *  @version $Id: EntryEdit.java,v 1.24 2006-01-17 15:49:37 tjc Exp $
+ *  @version $Id: EntryEdit.java,v 1.25 2006-01-17 16:05:05 tjc Exp $
  *
  */
 public class EntryEdit extends JFrame
@@ -70,7 +70,8 @@ public class EntryEdit extends JFrame
 
   /** The shortcut for Delete Selected Features. */
   final static KeyStroke SAVE_DEFAULT_KEY =
-    KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke(KeyEvent.VK_S,
+                           Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); // InputEvent.CTRL_MASK);
 
   /**
    *  A vector containing the Entry objects that this 
diff --git a/uk/ac/sanger/artemis/components/GotoMenu.java b/uk/ac/sanger/artemis/components/GotoMenu.java
index 3a822aa1d56d076bce821b3a9da83221be6de1be..d147529a9ae5022fc7a6747e8f3fe03d4a65af22 100644
--- a/uk/ac/sanger/artemis/components/GotoMenu.java
+++ b/uk/ac/sanger/artemis/components/GotoMenu.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/GotoMenu.java,v 1.2 2004-12-03 18:11:28 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/GotoMenu.java,v 1.3 2006-01-17 16:05:05 tjc Exp $
  **/
 
 package uk.ac.sanger.artemis.components;
@@ -39,7 +39,7 @@ import javax.swing.*;
  *  A JMenu with commands for moving around the entries.
  *
  *  @author Kim Rutherford
- *  @version $Id: GotoMenu.java,v 1.2 2004-12-03 18:11:28 tjc Exp $
+ *  @version $Id: GotoMenu.java,v 1.3 2006-01-17 16:05:05 tjc Exp $
  **/
 
 public class GotoMenu extends SelectionMenu {
@@ -150,31 +150,36 @@ public class GotoMenu extends SelectionMenu {
    *  The shortcut for the Navigator.
    **/
   final static KeyStroke NAVIGATOR_KEY =
-    KeyStroke.getKeyStroke (KeyEvent.VK_G, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke (KeyEvent.VK_G, 
+                            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
 
   /**
    *  The shortcut to go to the start of the selection.
    **/
   final static KeyStroke START_OF_SELECTION_KEY =
-    KeyStroke.getKeyStroke (KeyEvent.VK_LEFT, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke (KeyEvent.VK_LEFT, 
+                            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
 
   /**
    *  The shortcut to go to the end of the selection.
    **/
   final static KeyStroke END_OF_SELECTION_KEY =
-    KeyStroke.getKeyStroke (KeyEvent.VK_RIGHT, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke (KeyEvent.VK_RIGHT, 
+                            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
 
   /**
    *  The shortcut to go to the start of the sequence.
    **/
   final static KeyStroke START_OF_SEQUENCE_KEY =
-    KeyStroke.getKeyStroke (KeyEvent.VK_UP, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke (KeyEvent.VK_UP, 
+                            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
 
   /**
    *  The shortcut to go to the end of the sequence.
    **/
   final static KeyStroke END_OF_SEQUENCE_KEY =
-    KeyStroke.getKeyStroke (KeyEvent.VK_DOWN, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke (KeyEvent.VK_DOWN, 
+                            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
 
   /**
    *  Create a new GotoMenu object.
diff --git a/uk/ac/sanger/artemis/components/SelectMenu.java b/uk/ac/sanger/artemis/components/SelectMenu.java
index 2e42c0a5e31a59f5f332ccf43423c97fec561d3c..7f7acdc1122c006c5d4978e9fd41f3caef27d5df 100644
--- a/uk/ac/sanger/artemis/components/SelectMenu.java
+++ b/uk/ac/sanger/artemis/components/SelectMenu.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/SelectMenu.java,v 1.8 2005-10-11 14:20:31 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/SelectMenu.java,v 1.9 2006-01-17 16:05:05 tjc Exp $
  **/
 
 package uk.ac.sanger.artemis.components;
@@ -50,7 +50,7 @@ import javax.swing.*;
  *  "Select by key".
  *
  *  @author Kim Rutherford
- *  @version $Id: SelectMenu.java,v 1.8 2005-10-11 14:20:31 tjc Exp $
+ *  @version $Id: SelectMenu.java,v 1.9 2006-01-17 16:05:05 tjc Exp $
  **/
 
 public class SelectMenu extends SelectionMenu 
@@ -85,13 +85,15 @@ public class SelectMenu extends SelectionMenu
    *  The shortcut for Select All
    **/
   final static KeyStroke SELECT_ALL_KEY =
-    KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke(KeyEvent.VK_A, 
+                           Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
 
   /**
    *  The shortcut for Select None
    **/
   final static KeyStroke SELECT_NONE_KEY =
-    KeyStroke.getKeyStroke (KeyEvent.VK_N, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke (KeyEvent.VK_N, 
+                           Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
 
 
   /**
diff --git a/uk/ac/sanger/artemis/components/SelectionMenu.java b/uk/ac/sanger/artemis/components/SelectionMenu.java
index fdd0eb895fb98ffc6a50aa6510fa3a764ddf8981..c218dca5f5c0f9f0e251da923d6290572373f73e 100644
--- a/uk/ac/sanger/artemis/components/SelectionMenu.java
+++ b/uk/ac/sanger/artemis/components/SelectionMenu.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/SelectionMenu.java,v 1.2 2006-01-17 15:49:27 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/SelectionMenu.java,v 1.3 2006-01-17 16:05:05 tjc Exp $
  */
 
 package uk.ac.sanger.artemis.components;
@@ -39,7 +39,7 @@ import java.util.Vector;
  *  getParentFrame() to find the owning JFrame of the menu.
  *
  *  @author Kim Rutherford
- *  @version $Id: SelectionMenu.java,v 1.2 2006-01-17 15:49:27 tjc Exp $
+ *  @version $Id: SelectionMenu.java,v 1.3 2006-01-17 16:05:05 tjc Exp $
  **/
 
 public class SelectionMenu extends JMenu 
@@ -289,7 +289,8 @@ public class SelectionMenu extends JMenu
    **/
   protected static KeyStroke makeMenuKeyStroke(final int key_code)
   {
-    return KeyStroke.getKeyStroke(key_code, InputEvent.CTRL_MASK);
+    return KeyStroke.getKeyStroke(key_code, 
+                  Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
   }
 
   private void getJMenuItems(JMenu menu, Vector menu_items)
diff --git a/uk/ac/sanger/artemis/components/Splash.java b/uk/ac/sanger/artemis/components/Splash.java
index 6c2eab31a687a8df1d4ddae74eabdfeee2f2deaf..81a1d492deaed0157d6c79ddd8a8145ca576fca1 100644
--- a/uk/ac/sanger/artemis/components/Splash.java
+++ b/uk/ac/sanger/artemis/components/Splash.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/Splash.java,v 1.13 2006-01-03 16:46:01 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/Splash.java,v 1.14 2006-01-17 16:05:05 tjc Exp $
  */
 
 package uk.ac.sanger.artemis.components;
@@ -45,7 +45,7 @@ import java.lang.reflect.Constructor;
  *  Base class that creates a generic "Splash Screen"
  *
  *  @author Kim Rutherford <kmr@sanger.ac.uk>
- *  @version $Id: Splash.java,v 1.13 2006-01-03 16:46:01 tjc Exp $
+ *  @version $Id: Splash.java,v 1.14 2006-01-17 16:05:05 tjc Exp $
  **/
 
 abstract public class Splash extends JFrame 
@@ -830,7 +830,7 @@ abstract public class Splash extends JFrame
     new_item.addActionListener(listener);
     if(name.equals("Open ..."))
       new_item.setAccelerator(KeyStroke.getKeyStroke
-             (KeyEvent.VK_O, InputEvent.CTRL_MASK));
+             (KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); // InputEvent.CTRL_MASK));
   }
 
   /**
diff --git a/uk/ac/sanger/artemis/components/ViewMenu.java b/uk/ac/sanger/artemis/components/ViewMenu.java
index cd8dabab792e12faa1dcfef7839bc9631f19a07a..597ad48e94ae58311ac818737a9c6697d110dad4 100644
--- a/uk/ac/sanger/artemis/components/ViewMenu.java
+++ b/uk/ac/sanger/artemis/components/ViewMenu.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/ViewMenu.java,v 1.4 2005-10-11 14:20:31 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/ViewMenu.java,v 1.5 2006-01-17 16:05:05 tjc Exp $
  */
 
 package uk.ac.sanger.artemis.components;
@@ -45,7 +45,7 @@ import javax.swing.*;
  *  A popup menu with viewing commands.
  *
  *  @author Kim Rutherford
- *  @version $Id: ViewMenu.java,v 1.4 2005-10-11 14:20:31 tjc Exp $
+ *  @version $Id: ViewMenu.java,v 1.5 2006-01-17 16:05:05 tjc Exp $
  **/
 
 public class ViewMenu extends SelectionMenu {
@@ -451,7 +451,8 @@ public class ViewMenu extends SelectionMenu {
    *  The shortcut for Show Feature Plots.
    **/
   final static KeyStroke PLOT_FEATURES_KEY =
-    KeyStroke.getKeyStroke (KeyEvent.VK_W, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke (KeyEvent.VK_W, 
+                            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
 
   final static public int PLOT_FEATURES_KEY_CODE = KeyEvent.VK_W;
 
@@ -459,7 +460,8 @@ public class ViewMenu extends SelectionMenu {
    *  The shortcut for View Selected Features.
    **/
   final static KeyStroke VIEW_FEATURES_KEY =
-    KeyStroke.getKeyStroke (KeyEvent.VK_V, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke (KeyEvent.VK_V, 
+                            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
 
   final static public int VIEW_FEATURES_KEY_CODE = KeyEvent.VK_V;
 
@@ -467,7 +469,8 @@ public class ViewMenu extends SelectionMenu {
    *  The shortcut for Show Overview.
    **/
   final static KeyStroke OVERVIEW_KEY =
-    KeyStroke.getKeyStroke (KeyEvent.VK_O, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke (KeyEvent.VK_O, 
+                            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
 
   final static public int OVERVIEW_KEY_CODE = KeyEvent.VK_O;
 
@@ -475,7 +478,8 @@ public class ViewMenu extends SelectionMenu {
    *  The shortcut for View FASTA in browser.
    **/
   final static KeyStroke FASTA_IN_BROWSER_KEY =
-    KeyStroke.getKeyStroke (KeyEvent.VK_F, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke (KeyEvent.VK_F, 
+                            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
 
   final static public int FASTA_IN_BROWSER_KEY_CODE = KeyEvent.VK_F;
 
@@ -483,7 +487,8 @@ public class ViewMenu extends SelectionMenu {
    *  The shortcut for View FASTA.
    **/
   final static KeyStroke VIEW_FASTA_KEY =
-    KeyStroke.getKeyStroke (KeyEvent.VK_R, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke (KeyEvent.VK_R, 
+                            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
 
   final static public int VIEW_FASTA_KEY_CODE = KeyEvent.VK_R;
 
@@ -491,7 +496,8 @@ public class ViewMenu extends SelectionMenu {
    *  The shortcut for View BLASTP in browser.
    **/
   final static KeyStroke BLASTP_IN_BROWSER_KEY =
-    KeyStroke.getKeyStroke (KeyEvent.VK_B, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke (KeyEvent.VK_B, 
+                            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
 
   final static public int BLASTP_IN_BROWSER_KEY_CODE = KeyEvent.VK_B;
 
@@ -499,7 +505,8 @@ public class ViewMenu extends SelectionMenu {
    *  The shortcut for View BLASTP.
    **/
   final static KeyStroke VIEW_BLASTP_KEY =
-    KeyStroke.getKeyStroke (KeyEvent.VK_BACK_QUOTE , InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke (KeyEvent.VK_BACK_QUOTE , 
+                            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
 
   final static public int VIEW_BLASTP_KEY_CODE = KeyEvent.VK_BACK_QUOTE;
 
@@ -507,7 +514,8 @@ public class ViewMenu extends SelectionMenu {
    *  The shortcut for View HTH.
    **/
   final static KeyStroke VIEW_HTH_KEY =
-    KeyStroke.getKeyStroke (KeyEvent.VK_H, InputEvent.CTRL_MASK);
+    KeyStroke.getKeyStroke (KeyEvent.VK_H, 
+                            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); //InputEvent.CTRL_MASK);
 
   final static public int VIEW_HTH_KEY_CODE = KeyEvent.VK_H;