diff --git a/components/form/FormItem.jsx b/components/form/FormItem.jsx
index 182144bbdf..5c63713065 100644
--- a/components/form/FormItem.jsx
+++ b/components/form/FormItem.jsx
@@ -22,11 +22,11 @@ class FormItem extends React.Component {
 
   renderHelp() {
     const prefixCls = this.props.prefixCls;
-    return this.props.help ? (
-      <div className={prefixClsFn(prefixCls, 'explain')}>
+    return (
+      <div className={this.props.help ? prefixClsFn(prefixCls, 'explain') : ''}>
         {this.props.help}
       </div>
-    ) : null;
+    );
   }
 
   renderValidateWrapper(children) {
@@ -51,11 +51,11 @@ class FormItem extends React.Component {
 
   renderWrapper(children) {
     const wrapperCol = this.props.wrapperCol;
-    return wrapperCol ? (
+    return (
       <div className={this._getLayoutClass(wrapperCol)}>
         {children}
       </div>
-    ) : children;
+    );
   }
 
   renderLabel() {
diff --git a/components/form/Input.jsx b/components/form/Input.jsx
index a9673cde3f..4fb35f472f 100644
--- a/components/form/Input.jsx
+++ b/components/form/Input.jsx
@@ -43,13 +43,13 @@ class Input extends React.Component {
       </span>
     ) : null;
 
-    return addonBefore || addonAfter ? (
-      <div className={wrapperClassName}>
+    return (
+      <div className={(addonBefore || addonAfter) ? wrapperClassName : ''}>
         {addonBefore}
         {children}
         {addonAfter}
       </div>
-    ) : children;
+    );
   }
 
   renderInput() {
diff --git a/style/mixins/input.less b/style/mixins/input.less
index 0f1b20982e..a944f569f4 100644
--- a/style/mixins/input.less
+++ b/style/mixins/input.less
@@ -152,6 +152,7 @@
   }
 
   // Reset rounded corners
+  > div > .@{inputClass}:first-child,
   > .@{inputClass}:first-child,
   &-addon:first-child {
     border-bottom-right-radius: 0;