diff --git a/frontend/src/Editor/Inspector/EventManager.jsx b/frontend/src/Editor/Inspector/EventManager.jsx
index 2142538b86..390a7b6515 100644
--- a/frontend/src/Editor/Inspector/EventManager.jsx
+++ b/frontend/src/Editor/Inspector/EventManager.jsx
@@ -121,19 +121,18 @@ export const EventManager = ({
     });
     return componentOptions;
   }
-  // currently blocking items inside subcontainer because they can't be controlled through event manager
-  // use components instead of currentState?.components to get all the components in canvas
+
   function getComponentOptionsOfComponentsWithActions(componentType = '') {
     let componentOptions = [];
-    Object.values(currentState?.components || {}).forEach((value) => {
+    Object.keys(components || {}).forEach((key) => {
       const targetComponentMeta = componentTypes.find(
-        (componentType) => components[value.id]?.component?.component === componentType?.component
+        (componentType) => components[key].component.component === componentType.component
       );
       if ((targetComponentMeta?.actions?.length ?? 0) > 0) {
-        if (componentType === '' || components[value.id].component.component === componentType) {
+        if (componentType === '' || components[key].component.component === componentType) {
           componentOptions.push({
-            name: components[value.id].component.name,
-            value: value.id,
+            name: components[key].component.name,
+            value: key,
           });
         }
       }