diff --git a/components/Carbon.js b/components/Carbon.js
index be5f2f43f..537d1567c 100644
--- a/components/Carbon.js
+++ b/components/Carbon.js
@@ -310,7 +310,9 @@ class Carbon extends React.PureComponent {
               min-width: inherit;
               position: relative;
               z-index: 1;
-              border-radius: 5px;
+              ${config.borderRadius
+                ? `border-radius: ${config.borderRadius};`
+                : 'border-radius: 5px'};
               ${config.dropShadow
                 ? `box-shadow: 0 ${config.dropShadowOffsetY} ${config.dropShadowBlurRadius} rgba(0, 0, 0, 0.55)`
                 : ''};
@@ -321,7 +323,10 @@ class Carbon extends React.PureComponent {
               min-width: inherit;
               padding: 18px 18px;
               padding-left: 12px;
-              ${config.lineNumbers ? 'padding-left: 12px;' : ''} border-radius: 5px;
+              ${config.lineNumbers ? 'padding-left: 12px;' : ''}
+              ${config.borderRadius
+                ? `border-radius: ${config.borderRadius};`
+                : 'border-radius: 5px'};
               font-family: ${config.fontFamily}, monospace !important;
               font-size: ${config.fontSize};
               line-height: ${config.lineHeight};
diff --git a/components/Settings.js b/components/Settings.js
index 64383f725..66faa35b3 100644
--- a/components/Settings.js
+++ b/components/Settings.js
@@ -23,6 +23,7 @@ function KeyboardShortcut({ trigger, handle }) {
 function WindowSettings({
   onChange,
   windowTheme,
+  borderRadius,
   paddingHorizontal,
   paddingVertical,
   dropShadow,
@@ -42,6 +43,14 @@ function WindowSettings({
         windowControls={windowControls}
         onChange={onChange}
       />
+        <Slider
+          label="Corner Radius"
+          value={borderRadius}
+          minValue={0}
+          maxValue={25}
+          onChange={onChange.bind(null, 'borderRadius')}
+        />
+
       <div className="row">
         <Slider
           label="Padding (vert)"
@@ -375,6 +384,7 @@ class Settings extends React.PureComponent {
             onWidthChanging={this.handleWidthChanging}
             onWidthChanged={this.handleWidthChanged}
             windowTheme={this.props.windowTheme}
+            borderRadius={this.props.borderRadius}
             paddingHorizontal={this.props.paddingHorizontal}
             paddingVertical={this.props.paddingVertical}
             dropShadow={this.props.dropShadow}
diff --git a/lib/constants.js b/lib/constants.js
index 4325524cf..f823ebdcb 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -1097,6 +1097,7 @@ export const DEFAULT_SETTINGS = {
   backgroundImageSelection: null,
   backgroundMode: 'color',
   backgroundColor: DEFAULT_BG_COLOR,
+  borderRadius: '5px',
   dropShadow: true,
   dropShadowOffsetY: '20px',
   dropShadowBlurRadius: '68px',