diff --git a/extensions/formhistory.c b/extensions/formhistory.c
index a21b2577..c0eb8576 100644
--- a/extensions/formhistory.c
+++ b/extensions/formhistory.c
@@ -162,6 +162,7 @@ formhistory_update_main_hash (gchar* key,
     if (length > MAXCHARS || length < MINCHARS)
         return FALSE;
 
+    formhistory_fixup_value (key);
     formhistory_fixup_value (value);
     if ((tmp = g_hash_table_lookup (global_keys, (gpointer)key)))
     {