diff --git a/components/input/index.en-US.md b/components/input/index.en-US.md
index ea85bf72e6..01ead88c7b 100644
--- a/components/input/index.en-US.md
+++ b/components/input/index.en-US.md
@@ -56,7 +56,7 @@ The rest of the props of `Input.TextArea` are the same as the original [textarea
 
 | Property | Description | Type | Default |
 | -------- | ----------- | ---- | ------- |
-| enterButton | to show an enter button after input | boolean\|ReactNode | false |
+| enterButton | to show an enter button after input. This prop is conflict with addon. | boolean\|ReactNode | false |
 | onSearch | The callback function that is triggered when you click on the search-icon or press Enter key. | function(value, event) |  |
 
 Supports all props of `Input`.
diff --git a/components/input/index.zh-CN.md b/components/input/index.zh-CN.md
index b6d1079871..31f3cf69e8 100644
--- a/components/input/index.zh-CN.md
+++ b/components/input/index.zh-CN.md
@@ -53,7 +53,7 @@ Input 的其他属性和 React 自带的 [input](https://facebook.github.io/reac
 
 | 参数 | 说明 | 类型 | 默认值 |
 | --- | --- | --- | --- |
-| enterButton | 是否有确认按钮，可设为按钮文字 | boolean\|ReactNode | false |
+| enterButton | 是否有确认按钮，可设为按钮文字。该属性会与 addon 冲突。 | boolean\|ReactNode | false |
 | onSearch | 点击搜索或按下回车键时的回调 | function(value, event) |  |
 
 其余属性和 Input 一致。
diff --git a/components/input/style/search-input.less b/components/input/style/search-input.less
index 1cb161b56d..30ca98d894 100644
--- a/components/input/style/search-input.less
+++ b/components/input/style/search-input.less
@@ -15,14 +15,16 @@
     }
   }
 
-  .@{ant-prefix}-input-group-addon {
-    padding: 0;
-    border: 0;
+  &-enter-button {
+    .@{ant-prefix}-input-group-addon {
+      padding: 0;
+      border: 0;
 
-    .@{search-prefix}-button {
-      width: 100%;
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
+      .@{search-prefix}-button {
+        width: 100%;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+      }
     }
   }
 }