diff --git a/eek/eek-xml-layout.c b/eek/eek-xml-layout.c
index f3cc6a44..b41e0bf6 100644
--- a/eek/eek-xml-layout.c
+++ b/eek/eek-xml-layout.c
@@ -590,6 +590,10 @@ eek_xml_layout_real_create_keyboard (EekLayout *self,
     if (data.oref_outline_hash)
         g_hash_table_destroy (data.oref_outline_hash);
 
+    /* use pre-defined modifier mask here */
+    eek_keyboard_set_num_lock_mask (data.keyboard, EEK_MOD2_MASK);
+    eek_keyboard_set_alt_gr_mask (data.keyboard, EEK_MOD5_MASK);
+
     return data.keyboard;
 }