diff --git a/homeassistant/components/lutron/__init__.py b/homeassistant/components/lutron/__init__.py
index b38968c36b8..8382194ab46 100644
--- a/homeassistant/components/lutron/__init__.py
+++ b/homeassistant/components/lutron/__init__.py
@@ -140,6 +140,8 @@ class LutronButton:
     def __init__(self, hass, area_name, keypad, button):
         """Register callback for activity on the button."""
         name = f"{keypad.name}: {button.name}"
+        if button.name == "Unknown Button":
+            name += f" {button.number}"
         self._hass = hass
         self._has_release_event = (
             button.button_type is not None and "RaiseLower" in button.button_type
@@ -150,7 +152,7 @@ class LutronButton:
         self._button_name = button.name
         self._button = button
         self._event = "lutron_event"
-        self._full_id = slugify(f"{area_name} {keypad.name}: {button.name}")
+        self._full_id = slugify(f"{area_name} {name}")
 
         button.subscribe(self.button_callback, None)