diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c649555f93..2de4ceca91a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Added `isAutoRefreshOnly` prop to `EuiSuperDatePicker` ([#1412](https://github.com/elastic/eui/pull/1412))
 - Migrate remaining files in `accessiblity/` to TS ([#1408](https://github.com/elastic/eui/pull/1408))
 - Added `titleProps` and `descriptionProps` to `EuiDescriptionList` ([#1419](https://github.com/elastic/eui/pull/1419))
+- Propagate `className` on `EuiCodeBlock` in fullscreen mode ([#1422](https://github.com/elastic/eui/pull/1422))
 
 **Bug fixes**
 
diff --git a/src/components/code/_code_block.js b/src/components/code/_code_block.js
index 36489668d3b..e10b3c8ebd4 100644
--- a/src/components/code/_code_block.js
+++ b/src/components/code/_code_block.js
@@ -165,6 +165,7 @@ export class EuiCodeBlockImpl extends Component {
         fontSizeToClassNameMap[fontSize],
         'euiCodeBlock-paddingLarge',
         'euiCodeBlock-isFullScreen',
+        className,
       );
 
       fullScreenDisplay = (