diff --git a/etc/TODO b/etc/TODO
index c8909b778c4..15b99cdc87c 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -14,6 +14,8 @@ to the FSF.
 
 * Small but important fixes needed in existing features:
 
+** Compute the list of active keymaps *after* reading the first event.
+
 ** Avoid using "iff" in doc strings.
 
 ** mouse-autoselect-window should wait to select the window until