diff --git a/modules/firmware_apps/app_store.py b/modules/firmware_apps/app_store.py
index 714b368..7599d48 100644
--- a/modules/firmware_apps/app_store.py
+++ b/modules/firmware_apps/app_store.py
@@ -488,6 +488,8 @@ def __init__(self, install_handler: Callable[[str], Any], app: app.App):
         eventbus.on(ButtonDownEvent, self._handle_buttondown, app)
 
     def _handle_buttondown(self, event: ButtonDownEvent):
+        kbd_button = event.button.find_parent_in_group("Keyboard")
+
         if BUTTON_TYPES["UP"] in event.button:
             self.id += "0"
         elif BUTTON_TYPES["RIGHT"] in event.button:
@@ -500,6 +502,8 @@ def _handle_buttondown(self, event: ButtonDownEvent):
             self.id += "4"
         elif BUTTON_TYPES["CANCEL"] in event.button:
             self.id += "5"
+        elif kbd_button is not None and kbd_button.name in "012345":
+            self.id += kbd_button.name
 
         if len(self.id) == 8:
             self._cleanup()