diff --git a/frontend/src/Editor/Components/Container.jsx b/frontend/src/Editor/Components/Container.jsx
index b1735149fc..9422d2c57c 100644
--- a/frontend/src/Editor/Components/Container.jsx
+++ b/frontend/src/Editor/Components/Container.jsx
@@ -1,8 +1,15 @@
-import React from 'react';
+import React, { useRef } from 'react';
+import { SubCustomDragLayer } from '../SubCustomDragLayer';
+import { SubContainer } from '../SubContainer';
 
 export const Container = function Container({
-  id, width, height, component, onComponentClick
+  id,
+  component,
+  height,
+  containerProps,
+  width
 }) {
+
   const backgroundColor = component.definition.styles.backgroundColor.value;
 
   const computedStyles = {
@@ -11,5 +18,19 @@ export const Container = function Container({
     height
   };
 
-  return <div className="jet-container" onClick={() => onComponentClick(id, component)} style={computedStyles}></div>;
+  const parentRef = useRef(null);
+
+  return (
+    <div className="jet-container" ref={parentRef} onClick={() => containerProps.onComponentClick(id, component)} style={computedStyles}>
+            <SubContainer
+              parent={id}
+              {...containerProps}
+              parentRef={parentRef}
+            />
+            <SubCustomDragLayer 
+              snapToGrid={true} 
+              parentRef={parentRef}
+            />
+    </div>
+  );
 };
diff --git a/frontend/src/Editor/Inspector/EventSelector.jsx b/frontend/src/Editor/Inspector/EventSelector.jsx
index c128344811..37258a517c 100644
--- a/frontend/src/Editor/Inspector/EventSelector.jsx
+++ b/frontend/src/Editor/Inspector/EventSelector.jsx
@@ -92,7 +92,7 @@ export const EventSelector = ({
                 value={definition.options.model}
                 search={true}
                 onChange={(value) => {
-                  eventOptionUpdated(param, 'model', value, extraData);
+                  eventOptionUpdated(param, 'modal', value, extraData);
                 }}
                 filterOptions={fuzzySearch}
                 placeholder="Select.."