diff --git a/src/Modal.js b/src/Modal.js
index ef344409e7..31004023d3 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -56,7 +56,7 @@ const Modal = React.createClass({
         onClick={this.props.backdrop === true ? this.handleBackdropClick : null}
         ref="modal">
         <div className={classNames(dialogClasses)}>
-          <div className="modal-content" style={{overflow: 'hidden'}}>
+          <div className="modal-content">
             {this.props.title ? this.renderHeader() : null}
             {this.props.children}
           </div>
@@ -95,17 +95,23 @@ const Modal = React.createClass({
         );
     }
 
-    let style = this.props.bsStyle;
+    let bsStyle = this.props.bsStyle;
     let classes = {
       'modal-header': true
     };
-    classes['bg-' + style] = style;
-    classes['text-' + style] = style;
+    classes['bg-' + bsStyle] = bsStyle;
+    classes['text-' + bsStyle] = bsStyle;
 
     let className = classNames(classes);
 
+    let style = {};
+    if (this.props.bsStyle) {
+      style.borderTopLeftRadius = 'inherit';
+      style.borderTopRightRadius = 'inherit';
+    }
+
     return (
-      <div className={className}>
+      <div className={className} style={style}>
         {closeButton}
         {this.renderTitle()}
       </div>