diff --git a/packages/react-core/src/components/CodeBlock/CodeBlock.tsx b/packages/react-core/src/components/CodeBlock/CodeBlock.tsx
index a4174ea1fa2..f125a9c123c 100644
--- a/packages/react-core/src/components/CodeBlock/CodeBlock.tsx
+++ b/packages/react-core/src/components/CodeBlock/CodeBlock.tsx
@@ -18,9 +18,11 @@ export const CodeBlock: React.FunctionComponent<CodeBlockProps> = ({
   ...props
 }: CodeBlockProps) => (
   <div className={css(styles.codeBlock, className)} {...props}>
-    <div className={css(styles.codeBlockHeader)}>
-      <div className={css(styles.codeBlockActions)}>{actions && actions}</div>
-    </div>
+    {actions && (
+      <div className={css(styles.codeBlockHeader)}>
+        <div className={css(styles.codeBlockActions)}>{actions}</div>
+      </div>
+    )}
     <div className={css(styles.codeBlockContent)}>{children}</div>
   </div>
 );
diff --git a/packages/react-core/src/components/CodeBlock/__tests__/__snapshots__/CodeBlock.test.tsx.snap b/packages/react-core/src/components/CodeBlock/__tests__/__snapshots__/CodeBlock.test.tsx.snap
index 5b52e37d67e..669e48ee33b 100644
--- a/packages/react-core/src/components/CodeBlock/__tests__/__snapshots__/CodeBlock.test.tsx.snap
+++ b/packages/react-core/src/components/CodeBlock/__tests__/__snapshots__/CodeBlock.test.tsx.snap
@@ -5,13 +5,6 @@ exports[`CodeBlock renders successfully 1`] = `
   <div
     class="pf-c-code-block"
   >
-    <div
-      class="pf-c-code-block__header"
-    >
-      <div
-        class="pf-c-code-block__actions"
-      />
-    </div>
     <div
       class="pf-c-code-block__content"
     >