diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index d574ad77..8a0d1ebf 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -17,6 +17,7 @@ _This minor change does not contain any breaking changes._
 - [E2213](https://BASE_URL/controllerx/controllers/E2213) - add device with Z2M support. [ #885 ]
 - [Z31BRL](https://BASE_URL/controllerx/controllers/Z31BRL) - add Z2M support. [ #958 ]
 - [E2123](https://BASE_URL/controllerx/controllers/E2123) - add Z2M and deCONZ support. [ #842 ]
+- [ShellyDimmer2](https://BASE_URL/controllerx/controllers/ShellyDimmer2) - add Shelly support. [ #1014 ]
 
 <!--
 ## :hammer: Fixes
diff --git a/apps/controllerx/cx_devices/shelly.py b/apps/controllerx/cx_devices/shelly.py
index aa1fc35d..fca81a05 100644
--- a/apps/controllerx/cx_devices/shelly.py
+++ b/apps/controllerx/cx_devices/shelly.py
@@ -45,3 +45,13 @@ def get_shelly_actions_mapping(self) -> DefaultActionsMapping:
             "btn_up_2": Light.RELEASE,
             "double_push_2": Light.ON_MIN_BRIGHTNESS,
         }
+
+
+class ShellyDimmer2LightController(LightController):
+    def get_shelly_actions_mapping(self) -> DefaultActionsMapping:
+        return {
+            "single_1": Light.TOGGLE,
+            "single_2": None,
+            "long_1": Light.TOGGLE,
+            "long_2": None,
+        }
diff --git a/docs/docs/assets/controllers/ShellyDimmer2.jpeg b/docs/docs/assets/controllers/ShellyDimmer2.jpeg
new file mode 100644
index 00000000..77f5495e
Binary files /dev/null and b/docs/docs/assets/controllers/ShellyDimmer2.jpeg differ