diff --git a/assets/index.less b/assets/index.less
index 33d105c8b..75d8cb152 100644
--- a/assets/index.less
+++ b/assets/index.less
@@ -97,6 +97,9 @@
 }
 
 .@{tablePrefixCls} {
+  &-expand-icon-th {
+    width: 18px;
+  }
   &-expand-icon-col {
     width: 10px;
   }
diff --git a/examples/fixedColumns.js b/examples/fixedColumns.js
index ff8f0708a..16bd90d29 100644
--- a/examples/fixedColumns.js
+++ b/examples/fixedColumns.js
@@ -7,15 +7,15 @@ require('rc-table/assets/index.less');
 const columns = [
   { title: 'title1', dataIndex: 'a', key: 'a', width: 100, fixed: 'left' },
   { title: 'title2', dataIndex: 'b', key: 'b', width: 100, fixed: 'left' },
-  { title: 'title3', dataIndex: 'c', key: 'c' },
-  { title: 'title4', dataIndex: 'b', key: 'd' },
-  { title: 'title5', dataIndex: 'b', key: 'e' },
-  { title: 'title6', dataIndex: 'b', key: 'f' },
-  { title: 'title7', dataIndex: 'b', key: 'g' },
-  { title: 'title8', dataIndex: 'b', key: 'h' },
-  { title: 'title9', dataIndex: 'b', key: 'i' },
-  { title: 'title10', dataIndex: 'b', key: 'j' },
-  { title: 'title11', dataIndex: 'b', key: 'k' },
+  { title: 'title3', dataIndex: 'c', key: 'c', width: 100 },
+  { title: 'title4', dataIndex: 'b', key: 'd', width: 100 },
+  { title: 'title5', dataIndex: 'b', key: 'e', width: 100 },
+  { title: 'title6', dataIndex: 'b', key: 'f', width: 100 },
+  { title: <div>title7<br /><br /><br />Hello world!</div>, dataIndex: 'b', key: 'g', width: 100 },
+  { title: 'title8', dataIndex: 'b', key: 'h', width: 100 },
+  { title: 'title9', dataIndex: 'b', key: 'i', width: 100 },
+  { title: 'title10', dataIndex: 'b', key: 'j', width: 100 },
+  { title: 'title11', dataIndex: 'b', key: 'k', width: 100 },
   { title: 'title12', dataIndex: 'b', key: 'l', width: 100, fixed: 'right' },
 ];
 
diff --git a/src/Table.jsx b/src/Table.jsx
index 6c47a6bd8..b2a490f6c 100644
--- a/src/Table.jsx
+++ b/src/Table.jsx
@@ -409,11 +409,15 @@ const Table = React.createClass({
 
   getTable(options = {}) {
     const { columns, fixed } = options;
-    const { prefixCls, scroll = {}, getBodyWrapper } = this.props;
-    let { useFixedHeader } = this.props;
+    const { prefixCls, scroll = {}, getBodyWrapper, useFixedHeader } = this.props;
     const bodyStyle = { ...this.props.bodyStyle };
     const headStyle = {};
 
+    let useStandaloneHeader = useFixedHeader;
+    if (scroll.x || scroll.y) {
+      useStandaloneHeader = true;
+    }
+
     let tableClassName = '';
     if (scroll.x || columns) {
       tableClassName = `${prefixCls}-fixed`;
@@ -429,7 +433,6 @@ const Table = React.createClass({
         bodyStyle.maxHeight = bodyStyle.maxHeight || scroll.y;
       }
       bodyStyle.overflowY = bodyStyle.overflowY || 'scroll';
-      useFixedHeader = true;
 
       // Add negative margin bottom for scroll bar overflow bug
       const scrollbarWidth = measureScrollbar();
@@ -464,7 +467,7 @@ const Table = React.createClass({
     };
 
     let headTable;
-    if (useFixedHeader) {
+    if (useStandaloneHeader) {
       headTable = (
         <div
           className={`${prefixCls}-header`}
@@ -488,7 +491,7 @@ const Table = React.createClass({
         onTouchStart={this.detectScrollTarget}
         onScroll={this.handleBodyScroll}
       >
-        {renderTable(!useFixedHeader)}
+        {renderTable(!useStandaloneHeader)}
       </div>
     );
 
@@ -513,7 +516,7 @@ const Table = React.createClass({
             onTouchStart={this.detectScrollTarget}
             onScroll={this.handleBodyScroll}
           >
-            {renderTable(!useFixedHeader)}
+            {renderTable(!useStandaloneHeader)}
           </div>
         </div>
       );