diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx
index 70885e352a..fd30a4d226 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx
@@ -131,6 +131,14 @@ const VisualDesigner: React.FC<VisualDesignerProps> = ({ onFocus, onBlur, schema
     editorEvent && handleEditorEvent(editorEvent.type, editorEvent.payload);
   };
 
+  const marqueeStyles = (_) => {
+    return {
+      root: {
+        width: '100%',
+        height: '100%',
+      },
+    };
+  };
   return (
     <CacheProvider value={emotionCache}>
       <NodeRendererContext.Provider value={nodeContext}>
@@ -144,9 +152,9 @@ const VisualDesigner: React.FC<VisualDesignerProps> = ({ onFocus, onBlur, schema
             {...enableKeyboardCommandAttributes(handleCommand)}
             data-testid="visualdesigner-container"
           >
-            <ZoomZone flowZoomRate={flowZoomRate} focusedId={focusedId} updateFlowZoomRate={updateFlowZoomRate}>
-              <SelectionContext.Provider value={selectionContext}>
-                <MarqueeSelection selection={selection}>
+            <SelectionContext.Provider value={selectionContext}>
+              <MarqueeSelection selection={selection} styles={marqueeStyles}>
+                <ZoomZone flowZoomRate={flowZoomRate} focusedId={focusedId} updateFlowZoomRate={updateFlowZoomRate}>
                   <div
                     className="flow-editor-container"
                     css={{
@@ -180,9 +188,9 @@ const VisualDesigner: React.FC<VisualDesignerProps> = ({ onFocus, onBlur, schema
                       }}
                     />
                   </div>
-                </MarqueeSelection>
-              </SelectionContext.Provider>
-            </ZoomZone>
+                </ZoomZone>
+              </MarqueeSelection>
+            </SelectionContext.Provider>
           </div>
         </SelfHostContext.Provider>
       </NodeRendererContext.Provider>
diff --git a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/components/ZoomZone.tsx b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/components/ZoomZone.tsx
index 0f3788a39f..3ea73b81ed 100644
--- a/Composer/packages/adaptive-flow/src/adaptive-flow-editor/components/ZoomZone.tsx
+++ b/Composer/packages/adaptive-flow/src/adaptive-flow-editor/components/ZoomZone.tsx
@@ -142,9 +142,11 @@ export const ZoomZone: React.FC<ZoomZoneProps> = ({ flowZoomRate, focusedId, upd
   }, [flowZoomRate]);
 
   return (
-    <div ref={divRef} css={{ overflow: 'scroll', width: '100%', height: '100%' }}>
-      {children}
-      {buttonRender()}
+    <div css={{ width: '100%', height: '100%' }}>
+      <div ref={divRef} css={{ width: '100%', height: '100%', overflow: 'scroll' }}>
+        {children}
+        {buttonRender()}
+      </div>
     </div>
   );
 };