diff --git a/CHANGELOG.json b/CHANGELOG.json
index 8ce6c152..85fb0e07 100644
--- a/CHANGELOG.json
+++ b/CHANGELOG.json
@@ -4,10 +4,17 @@
       "version": "3.16.0",
       "changes": {
         "new": [],
-        "enhancements": [],
-        "fixes": []
+        "enhancements": [
+          "`PropertyFieldSitePicker`: disabled property not implemented in UI [#577](https://github.com/pnp/sp-dev-fx-property-controls/issues/577)"
+        ],
+        "fixes": [
+          "`PropertyFieldMonacoEditor` and `PropertyFieldCodeEditor`: fix text selection in code editor [#590](https://github.com/pnp/sp-dev-fx-property-controls/issues/590)"
+        ]
       },
-      "contributions": []
+      "contributions": [
+        "[Luna Heyman](https://github.com/toodeluna)",
+        "[srpmtt](https://github.com/srpmtt)"
+      ]
     },
     {
       "version": "3.15.1",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ba84b86..7719cba2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 ## 3.16.0
 
+### Fixes
+
+- `PropertyFieldMonacoEditor` and `PropertyFieldCodeEditor`: fix text selection in code editor [#590](https://github.com/pnp/sp-dev-fx-property-controls/issues/590)
+
+### Contributors
+
+Special thanks to our contributor: [Luna Heyman](https://github.com/toodeluna).
+
 ## 3.15.1
 
 ### Fixes
diff --git a/docs/documentation/docs/about/release-notes.md b/docs/documentation/docs/about/release-notes.md
index 9ba84b86..7719cba2 100644
--- a/docs/documentation/docs/about/release-notes.md
+++ b/docs/documentation/docs/about/release-notes.md
@@ -2,6 +2,14 @@
 
 ## 3.16.0
 
+### Fixes
+
+- `PropertyFieldMonacoEditor` and `PropertyFieldCodeEditor`: fix text selection in code editor [#590](https://github.com/pnp/sp-dev-fx-property-controls/issues/590)
+
+### Contributors
+
+Special thanks to our contributor: [Luna Heyman](https://github.com/toodeluna).
+
 ## 3.15.1
 
 ### Fixes
diff --git a/package.json b/package.json
index fa5ecbc6..01bb3001 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@pnp/spfx-property-controls",
   "description": "Reusable property pane controls for SharePoint Framework solutions",
-  "version": "3.15.1",
+  "version": "3.16.0",
   "engines": {
     "node": ">=16.13.0 <17.0.0 || >=18.17.1 <19.0.0"
   },
diff --git a/src/common/telemetry/version.ts b/src/common/telemetry/version.ts
index d2256110..7c110cac 100644
--- a/src/common/telemetry/version.ts
+++ b/src/common/telemetry/version.ts
@@ -1 +1 @@
-export const version: string = "3.15.1";
\ No newline at end of file
+export const version: string = "3.16.0";
\ No newline at end of file
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>
diff --git a/src/propertyFields/sitePicker/PropertyFieldSitePickerHost.tsx b/src/propertyFields/sitePicker/PropertyFieldSitePickerHost.tsx
index be1d7309..b9c7c475 100644
--- a/src/propertyFields/sitePicker/PropertyFieldSitePickerHost.tsx
+++ b/src/propertyFields/sitePicker/PropertyFieldSitePickerHost.tsx
@@ -90,6 +90,7 @@ export default class PropertyFieldSitePickerHost extends React.Component<IProper
       <div>
         {this.props.label && <Label>{this.props.label}</Label>}
         <SearchBox
+          disabled={this.props.disabled}
           placeholder={strings.SitePickerSearchBoxPlaceholder}
           onChanged={this.async.debounce(this.onSearchFieldChange, this.props.deferredValidationTime)}
         />
diff --git a/src/webparts/propertyControlsTest/PropertyControlsTestWebPart.ts b/src/webparts/propertyControlsTest/PropertyControlsTestWebPart.ts
index a19b9fca..d3cb525f 100644
--- a/src/webparts/propertyControlsTest/PropertyControlsTestWebPart.ts
+++ b/src/webparts/propertyControlsTest/PropertyControlsTestWebPart.ts
@@ -775,7 +775,8 @@ export default class PropertyControlsTestWebPart extends BaseClientSideWebPart<I
                   onPropertyChange: this.onPropertyPaneFieldChanged,
                   properties: this.properties,
                   key: 'sitesFieldId',
-                  trimDuplicates: true
+                  trimDuplicates: true,
+                  disabled: false
                 }),
                 PropertyFieldTeamPicker('teams', {
                   key: 'teamsPicker',