diff --git a/src/propertyFields/codeEditor/PropertyFieldCodeEditorHost.tsx b/src/propertyFields/codeEditor/PropertyFieldCodeEditorHost.tsx
index d2a9f529..c3eaadcb 100644
--- a/src/propertyFields/codeEditor/PropertyFieldCodeEditorHost.tsx
+++ b/src/propertyFields/codeEditor/PropertyFieldCodeEditorHost.tsx
@@ -216,6 +216,7 @@ export default class PropertyFieldCodeEditorHost extends React.Component<IProper
               boxSizing: 'border-box'
             }
           }}
+          layerProps={{ eventBubblingEnabled: true }}
           onRenderFooterContent={() => (
             <div className={styles.actions}>
               <div className="ms-Grid" dir="ltr">
diff --git a/src/propertyFields/monacoEditor/PropertyFieldMonacoEditorHost.tsx b/src/propertyFields/monacoEditor/PropertyFieldMonacoEditorHost.tsx
index e477fe2e..0f962a85 100644
--- a/src/propertyFields/monacoEditor/PropertyFieldMonacoEditorHost.tsx
+++ b/src/propertyFields/monacoEditor/PropertyFieldMonacoEditorHost.tsx
@@ -103,7 +103,9 @@ export default class PropertyFieldMonacoEditorHost extends React.Component<
           }}
           headerText={strings.MonacoEditorPanelTitle}
           onRenderFooterContent={this.onRenderFooterContent}
-          isFooterAtBottom={true}>
+          isFooterAtBottom={true}
+          layerProps={{ eventBubblingEnabled: true }}
+        >
           <div className={this.controlClasses.headerTitle}>
             <MonacoEditor {...this.props} onValueChange={ this._onValueChange}/>
           </div>