diff --git a/src/components/CodeEditor/CodeEditor.js b/src/components/CodeEditor/CodeEditor.js
index 6a99c7156c0..4ad88249aa8 100644
--- a/src/components/CodeEditor/CodeEditor.js
+++ b/src/components/CodeEditor/CodeEditor.js
@@ -105,7 +105,7 @@ class CodeEditor extends Component {
                 overflow: 'hidden',
                 borderRadius: '10px 0 0 10px',
 
-                [media.lessThan('small')]: {
+                [media.lessThan('medium')]: {
                   borderRadius: '10px 10px 0 0',
                 },
               }}>
@@ -128,6 +128,10 @@ class CodeEditor extends Component {
                   marginRight: '0 !important',
                   paddingRight: '0 !important',
 
+                  [media.lessThan('medium')]: {
+                    marginBottom: '0 !important',
+                  },
+
                   '& pre.prism-code[contenteditable]': {
                     maxHeight: '280px !important',
                     outline: 0,
@@ -186,7 +190,7 @@ class CodeEditor extends Component {
                   border: `1px solid ${colors.divider}`,
                   borderRadius: '0 10px 10px 0',
 
-                  [media.lessThan('small')]: {
+                  [media.lessThan('medium')]: {
                     borderRadius: '0 0 10px 10px',
                   },
                 }}>