diff --git a/components/form/FormItem.jsx b/components/form/FormItem.jsx
index b0fb0d729..91df196ec 100644
--- a/components/form/FormItem.jsx
+++ b/components/form/FormItem.jsx
@@ -41,7 +41,7 @@ class FormItem extends React.Component {
       );
     }
     return (
-      <div className={classes}>
+      <div className={this.props.prefixCls + '-item-control ' + classes}>
         {c1}{c2}
       </div>
     );
diff --git a/style/components/form.less b/style/components/form.less
index eb5cd1009..ee18b37b9 100644
--- a/style/components/form.less
+++ b/style/components/form.less
@@ -71,6 +71,11 @@ input[type="checkbox"] {
   margin-bottom: @form-item-margin-bottom;
   color: #666;
 
+  &-control {
+    min-height: 32px;
+    line-height: 32px;
+  }
+
   &.@{css-prefix}form-item-with-help {
     margin-bottom: @form-item-margin-bottom - @font-size-base * @line-height-base;
   }
@@ -90,13 +95,6 @@ input[type="checkbox"] {
   }
 }
 
-.@{css-prefix}form-text,
-.@{css-prefix}form-split {
-  margin: 0!important;
-  padding-top: 7px;
-  padding-bottom: 7px;
-}
-
 .@{css-prefix}form-text {
   display: inline-block;
   padding-right: 8px;
@@ -279,8 +277,7 @@ form {
 .@{css-prefix}form-horizontal,
 .@{css-prefix}form-inline {
   label {
-    padding-top: 7px;
-    padding-bottom: 7px;
+    line-height: 32px;
     > input[type="radio"],
     > input[type="checkbox"] {
       margin-right: 5px;
diff --git a/style/mixins/input.less b/style/mixins/input.less
index bf29321a9..e1de58153 100644
--- a/style/mixins/input.less
+++ b/style/mixins/input.less
@@ -132,6 +132,10 @@
     vertical-align: middle;
   }
 
+  &-wrap > * {
+    display: block;
+  }
+
   .@{inputClass} {
     position: relative;
     z-index: 2;