--- src/menu.c.predag	2009-08-04 22:10:17.000000000 +0100
+++ src/menu.c	2009-08-04 23:28:41.000000000 +0100
@@ -49,18 +49,18 @@
     {MENU_OP_MOVE,         NULL,                N_("_Move")},
     {MENU_OP_RESIZE,       NULL,                N_("_Resize")},
     {0, NULL, NULL}, /* -------------------------------------------------------- */
-    {MENU_OP_ABOVE,        NULL,                N_("Always on Top")},
-    {MENU_OP_NORMAL,       NULL,                N_("Same as Other Windows")},
-    {MENU_OP_BELOW,        NULL,                N_("Always Below Other Windows")},
+    {MENU_OP_ABOVE,        NULL,                N_("Always on _Top")},
+    {MENU_OP_NORMAL,       NULL,                N_("_Same as Other Windows")},
+    {MENU_OP_BELOW,        NULL,                N_("Always _Below Other Windows")},
     {MENU_OP_SHADE,        WM_STOCK_ROLLUP,     N_("Roll Window Up")},
     {MENU_OP_UNSHADE,      WM_STOCK_ROLLDOWN,   N_("Roll Window Down")},
     {MENU_OP_FULLSCREEN,   "gtk-fullscreen",    N_("_Fullscreen")},
     {MENU_OP_UNFULLSCREEN, "gtk-fullscreen",    N_("Leave _Fullscreen")},
     {MENU_OP_CONTEXT_HELP, "gtk-help",          N_("Context _Help")},
     {0, NULL, NULL}, /* -------------------------------------------------------- */
-    {MENU_OP_STICK,        NULL,                N_("Always on Visible Workspace")},
-    {MENU_OP_UNSTICK,      NULL,                N_("Only on This Workspace")},
-    {MENU_OP_WORKSPACES,   NULL,                N_("Move to Another Workspace")},
+    {MENU_OP_STICK,        NULL,                N_("Always on _Visible Workspace")},
+    {MENU_OP_UNSTICK,      NULL,                N_("_Only on This Workspace")},
+    {MENU_OP_WORKSPACES,   NULL,                N_("Move to Another _Workspace")},
     {0, NULL, NULL}, /* -------------------------------------------------------- */
     {MENU_OP_DELETE,       "gtk-close",         N_("_Close")},
 #if 0
@@ -182,15 +182,24 @@
 
     for (i = 0; i < nws; i++)
     {
-        if ((i < wsn_items) && wsn[i])
+        if ((i < wsn_items) && wsn[i] && *(wsn[i]))
         {
             name = g_strdup_printf ("%i (%s)", i+ 1, wsn[i]);
+            menuitem = gtk_menu_item_new_with_label (name);
         }
         else
         {
-            name = g_strdup_printf ("%i", i + 1);
+            if ((i+1) < 10)
+            {
+                name = g_strdup_printf ("_%i", i + 1);
+                menuitem = gtk_menu_item_new_with_mnemonic (name);
+            }
+            else
+            {
+                name = g_strdup_printf ("%i", i + 1);
+                menuitem = gtk_menu_item_new_with_label (name);
+            }
         }
-        menuitem = gtk_menu_item_new_with_label (name);
         g_free (name);
         gtk_widget_set_sensitive (menuitem, !(insensitive & MENU_OP_WORKSPACES) && (i != ws));
         gtk_widget_show (menuitem);