diff --git a/ChangeLog b/ChangeLog
index 58b4bda28..023e53860 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-10  Havoc Pennington  <hp@pobox.com>
+
+	* src/menu.c (meta_window_menu_new): don't do mnemonics for
+	workspaces above 9
+
 2001-12-10  Havoc Pennington  <hp@pobox.com>
 
 	* src/screen.c (meta_screen_new): oops, remove extra workspace
diff --git a/src/menu.c b/src/menu.c
index aea8942ca..708274f3e 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -258,12 +258,12 @@ meta_window_menu_new   (MetaFrames         *frames,
               MenuData *md;
 
               if (ops & META_MENU_OP_UNSTICK)
-                label = g_strdup_printf (_("Only on workspace _%d"),
-                                         i + 1);
+                label = g_strdup_printf (_("Only on workspace %s%d"),
+                                         i < 9 ? "_" : "", i + 1);
               else
-                label = g_strdup_printf (_("Move to workspace _%d"),
-                                         i + 1);
-          
+                label = g_strdup_printf (_("Move to workspace %s%d"),
+                                         i < 9 ? "_" : "", i + 1);
+              
               mi = gtk_menu_item_new_with_mnemonic (label);
 
               g_free (label);