diff --git a/app/client/netlify.toml b/app/client/netlify.toml
index 636435be87..067be5b3a5 100644
--- a/app/client/netlify.toml
+++ b/app/client/netlify.toml
@@ -10,6 +10,10 @@
   [context.develop.environment]
     REACT_APP_ENVIRONMENT = "DEVELOPMENT"
 
-[context.deploy-preview]
-  [context.deploy-preview.environment]
-    REACT_APP_ENVIRONMENT = "DEVELOPMENT"
+[context.a]
+  [context.a.environment]
+    REACT_APP_ENVIRONMENT = "STAGING"
+
+[context.b]
+  [context.b.environment]
+    REACT_APP_ENVIRONMENT = "STAGING"
diff --git a/app/client/src/components/editorComponents/DraggableComponent.tsx b/app/client/src/components/editorComponents/DraggableComponent.tsx
index 571b3336dc..faf0a844b4 100644
--- a/app/client/src/components/editorComponents/DraggableComponent.tsx
+++ b/app/client/src/components/editorComponents/DraggableComponent.tsx
@@ -39,6 +39,7 @@ const WidgetBoundaries = styled.div`
   border: 1px dashed
     ${props => getColorWithOpacity(props.theme.colors.textAnchor, 0.5)};
   position: absolute;
+  pointer-events: none;
 `;
 
 const DragHandle = styled.div`