diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 3c7aa25f94..f0fd92c1db 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -10016,7 +10016,12 @@ keymap_state_changed (GdkKeymap *keymap,
 
   if (gtk_entry_get_display_mode (entry) != DISPLAY_NORMAL && priv->caps_lock_warning)
     { 
-      if (gdk_keymap_get_caps_lock_state (keymap))
+      if (gdk_keymap_get_num_lock_state (keymap)
+          && gdk_keymap_get_caps_lock_state (keymap))
+        text = _("Caps Lock and Num Lock are on");
+      else if (gdk_keymap_get_num_lock_state (keymap))
+        text = _("Num Lock is on");
+      else if (gdk_keymap_get_caps_lock_state (keymap))
         text = _("Caps Lock is on");
     }