diff --git a/components/tree/__tests__/index-spec.js b/components/tree/__tests__/index-spec.js
index 60b2faa5c0..29d86c1c38 100644
--- a/components/tree/__tests__/index-spec.js
+++ b/components/tree/__tests__/index-spec.js
@@ -264,6 +264,21 @@ describe('Tree', () => {
         assertTree({ children: loop(dataSource), dataSource }, mountNode);
     });
 
+    it('should switcher ignore flex when node is long text', () => {
+        ReactDOM.render(
+            <Tree
+                selectable={false}
+                isLabelBlock
+                defaultExpandedKeys={['0-0', '0-0-0', '0-0-0-0']}
+            >
+                 <TreeNode key="2" className="long-text-node" label={<div style={{width: '200vw'}}>long text</div>} />
+            </Tree>,
+            mountNode
+        );
+        const switcher = document.querySelector('.long-text-node .next-tree-switcher');
+        assert(switcher && switcher.clientWidth);
+    });
+
     it('should ignore children contain null or string', () => {
         ReactDOM.render(
             <Tree checkable editable defaultExpandAll defaultSelectedKeys={['1']} defaultCheckedKeys={['3']}>
diff --git a/components/tree/main.scss b/components/tree/main.scss
index 96acb11fec..99bfd34d50 100644
--- a/components/tree/main.scss
+++ b/components/tree/main.scss
@@ -127,6 +127,7 @@
     }
 
     &-switcher.#{$css-prefix}noop-noline {
+        flex: none;
         width: $tree-switch-arrow-size;
         height: $tree-switch-arrow-size;
     }