diff --git a/components/input/__tests__/__snapshots__/demo.test.js.snap b/components/input/__tests__/__snapshots__/demo.test.js.snap
index 69d649665b..b07a06416a 100644
--- a/components/input/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/input/__tests__/__snapshots__/demo.test.js.snap
@@ -890,6 +890,42 @@ exports[`renders ./components/input/demo/align.md correctly 1`] = `
       </span>
     </span>
   </span>
+  <span
+    class="ant-input-affix-wrapper"
+    style="width:50px"
+  >
+    <input
+      class="ant-input"
+      type="text"
+      value=""
+    />
+    <span
+      class="ant-input-suffix"
+    >
+      Y
+    </span>
+  </span>
+  <input
+    class="ant-input"
+    style="width:50px"
+    type="text"
+    value=""
+  />
+  <span
+    class="ant-input-affix-wrapper"
+    style="width:50px"
+  >
+    <input
+      class="ant-input"
+      type="text"
+      value="1"
+    />
+    <span
+      class="ant-input-suffix"
+    >
+      Y
+    </span>
+  </span>
 </div>
 `;
 
diff --git a/components/input/demo/align.md b/components/input/demo/align.md
index cda4c83afe..e2ad4e24cc 100644
--- a/components/input/demo/align.md
+++ b/components/input/demo/align.md
@@ -28,6 +28,10 @@ const RadioGroup = Radio.Group;
 const Option = Select.Option;
 const { MonthPicker, RangePicker } = DatePicker;
 
+const narrowStyle = {
+  width: 50,
+};
+
 const options = [
   {
     value: 'zhejiang',
@@ -94,6 +98,9 @@ ReactDOM.render(
     <AutoComplete style={{ width: 100 }} placeholder="input here" />
     <br />
     <Input prefix="$" addonBefore="Http://" addonAfter=".com" defaultValue="mysite" />
+    <Input style={narrowStyle} suffix="Y" />
+    <Input style={narrowStyle} />
+    <Input style={narrowStyle} defaultValue="1" suffix="Y" />
   </div>,
   mountNode,
 );
diff --git a/components/input/style/affix.less b/components/input/style/affix.less
index 35511d4d9a..3e1de60668 100644
--- a/components/input/style/affix.less
+++ b/components/input/style/affix.less
@@ -17,6 +17,12 @@
         box-shadow: none;
       }
     }
+
+    &::before {
+      width: 0;
+      visibility: hidden;
+      content: '\a0';
+    }
   }
 
   &-prefix,