diff --git a/ChangeLog b/ChangeLog
index 85bce5d5bc..45a3355686 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-19  Christopher Aillon  <caillon@redhat.com>
+
+	* gnome/applet/other-network-dialog.c:
+	* gnome/applet/wireless-applet.glade:
+	Also need mnemonic widgets, and underline enabled.
+
 2005-08-19  Dan Williams <dcbw@redhat.com>
 
 	* vpn-daemons/vpnc/nm-vpnc-service.c
diff --git a/gnome/applet/other-network-dialog.c b/gnome/applet/other-network-dialog.c
index 98ca971d0e..6283eee8ef 100644
--- a/gnome/applet/other-network-dialog.c
+++ b/gnome/applet/other-network-dialog.c
@@ -140,13 +140,13 @@ static void nmwa_other_network_dialog_key_type_combo_changed (GtkWidget *key_typ
 	switch ((combo_choice = gtk_combo_box_get_active (GTK_COMBO_BOX (key_type_combo))))
 	{
 		case KEY_TYPE_128_BIT_PASSPHRASE:
-			gtk_label_set_label (entry_label, _("_Passphrase:"));
+			gtk_label_set_text_with_mnemonic (entry_label, _("_Passphrase:"));
 			break;
 		case KEY_TYPE_ASCII_KEY:
-			gtk_label_set_label (entry_label, _("_ASCII Key:"));
+			gtk_label_set_text_with_mnemonic (entry_label, _("_ASCII Key:"));
 			break;
 		case KEY_TYPE_HEX_KEY:
-			gtk_label_set_label (entry_label, _("_Hex Key:"));
+			gtk_label_set_text_with_mnemonic (entry_label, _("_Hex Key:"));
 			break;
 		default:
 			break;
diff --git a/gnome/applet/wireless-applet.glade b/gnome/applet/wireless-applet.glade
index c157528535..b90ae9aca5 100644
--- a/gnome/applet/wireless-applet.glade
+++ b/gnome/applet/wireless-applet.glade
@@ -555,8 +555,9 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 			      <child>
 				<widget class="GtkLabel" id="key_type_combo_label">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Key type:</property>
-				  <property name="use_underline">False</property>
+				  <property name="label" translatable="yes">_Key type:</property>
+				  <property name="mnemonic_widget">key_type_combo</property>
+				  <property name="use_underline">True</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
 				  <property name="wrap">False</property>
@@ -583,7 +584,8 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 			      <child>
 				<widget class="GtkLabel" id="passphrase_entry_label">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Passphrase:</property>
+				  <property name="label" translatable="yes">_Passphrase:</property>
+				  <property name="mnemonic_widget">passphrase_entry</property>
 				  <property name="use_underline">False</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -831,6 +833,7 @@ A passphrase or encryption key is required to access the wireless network '%s'.<
 		    <widget class="GtkLabel" id="label3">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Key Type:</property>
+		      <property name="mnemonic_widget">key_type_combo</property>
 		      <property name="use_underline">True</property>
 		      <property name="use_markup">False</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -889,6 +892,7 @@ Hex Key (WEP)</property>
 		    <widget class="GtkLabel" id="passphrase_entry_label">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Passphrase:</property>
+		      <property name="mnemonic_widget">passphrase_entry</property>
 		      <property name="use_underline">True</property>
 		      <property name="use_markup">False</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>