diff --git a/packages/netlify-cms-widget-code/src/CodeControl.js b/packages/netlify-cms-widget-code/src/CodeControl.js
index 0bf00bf0..0d960c23 100644
--- a/packages/netlify-cms-widget-code/src/CodeControl.js
+++ b/packages/netlify-cms-widget-code/src/CodeControl.js
@@ -271,6 +271,8 @@ export default class CodeControl extends React.Component {
               id={forID}
               className={css`
                 height: 100%;
+                border-radius: 0 3px 3px 3px;
+                overflow: hidden;
 
                 .CodeMirror {
                   height: auto;
diff --git a/packages/netlify-cms-widget-code/src/SettingsPane.js b/packages/netlify-cms-widget-code/src/SettingsPane.js
index d077016a..8aeca9e8 100644
--- a/packages/netlify-cms-widget-code/src/SettingsPane.js
+++ b/packages/netlify-cms-widget-code/src/SettingsPane.js
@@ -13,8 +13,10 @@ const SettingsPaneContainer = styled.div`
   z-index: 10;
   height: 100%;
   background-color: #fff;
+  overflow: hidden;
   overflow-y: scroll;
   padding: 12px;
+  border-radius: 0 3px 3px 0;
   ${shadows.drop};
 `;