diff --git a/components/input/index.jsx b/components/input/index.jsx
index 6094923abe..13159fd225 100644
--- a/components/input/index.jsx
+++ b/components/input/index.jsx
@@ -17,9 +17,10 @@ function ieGT9() {
 class Group extends React.Component {
   render() {
     return (
-      <div className={this.props.className}>
+      <span className={this.props.className}
+           style={this.props.style}>
         {this.props.children}
-      </div>
+      </span>
     );
   }
 }
@@ -52,11 +53,11 @@ class Input extends React.Component {
     ) : null;
 
     return (
-      <div className={(addonBefore || addonAfter) ? wrapperClassName : ''}>
+      <span className={(addonBefore || addonAfter) ? wrapperClassName : ''}>
         {addonBefore}
         {children}
         {addonAfter}
-      </div>
+      </span>
     );
   }
 
diff --git a/style/mixins/input.less b/style/mixins/input.less
index f313820175..17fb9c7211 100644
--- a/style/mixins/input.less
+++ b/style/mixins/input.less
@@ -152,7 +152,7 @@
   }
 
   // Reset rounded corners
-  > div > .@{inputClass}:first-child,
+  > span > .@{inputClass}:first-child,
   > .@{inputClass}:first-child,
   &-addon:first-child {
     border-bottom-right-radius: 0;