diff --git a/lib/components/src/syntaxhighlighter/syntaxhighlighter.js b/lib/components/src/syntaxhighlighter/syntaxhighlighter.js
index 01617d5ec22b..3d7b16d80b4f 100644
--- a/lib/components/src/syntaxhighlighter/syntaxhighlighter.js
+++ b/lib/components/src/syntaxhighlighter/syntaxhighlighter.js
@@ -12,6 +12,7 @@ import html from 'react-syntax-highlighter/languages/prism/markup';
 import SyntaxHighlighter, { registerLanguage } from 'react-syntax-highlighter/prism-light';
 import { js as beautify } from 'js-beautify';
 import { ActionBar } from '../ActionBar/ActionBar';
+import { ScrollArea } from '../ScrollArea/ScrollArea';
 
 registerLanguage('jsx', jsx);
 registerLanguage('bash', bash);
@@ -37,10 +38,9 @@ const Wrapper = styled.div(
       : {}
 );
 
-const Scroller = styled.div(
+const Scroller = styled(props => <ScrollArea vertical horizontal {...props} />)(
   {
     position: 'relative',
-    overflow: 'auto',
   },
   ({ theme }) => ({
     '& code': {