diff --git a/src/add-ons/input_server/devices/virtualkeyboard/TODO b/src/add-ons/input_server/devices/virtualkeyboard/TODO
index 5db24415a1..d40ea43da3 100644
--- a/src/add-ons/input_server/devices/virtualkeyboard/TODO
+++ b/src/add-ons/input_server/devices/virtualkeyboard/TODO
@@ -4,3 +4,5 @@
 -The held down keys (ctrl, caps, shift, alt, etc) have an issue where they stay down. To replicate click one of the listed keys. Click an alphabet key. Then try click the held down key again. The key will stay stuck
 -Add deskbar option to open the keyboard
 -factor-out code common to both Keymap and VirtualKeyboard
+-handle B_KEY_MAP_CHANGED and B_KEY_LOCKS_CHANGED
+-find a way to not start it on boot (might need patching input_server)