diff --git a/components/form/style/index.less b/components/form/style/index.less
index 0524364c00..8b4797358c 100644
--- a/components/form/style/index.less
+++ b/components/form/style/index.less
@@ -236,8 +236,13 @@ form {
     margin-left: 0;
   }
 
-  .@{ant-prefix}-input-number + .@{form-prefix-cls}-text {
-    margin-left: 8px;
+  .@{ant-prefix}-input-number {
+    + .@{form-prefix-cls}-text {
+      margin-left: 8px;
+    }
+    &-handler-wrap {
+      z-index: 2; // https://github.com/ant-design/ant-design/issues/6289
+    }
   }
 
   .@{ant-prefix}-select,
diff --git a/components/input-number/style/index.less b/components/input-number/style/index.less
index a90e63d62a..538721bc15 100644
--- a/components/input-number/style/index.less
+++ b/components/input-number/style/index.less
@@ -109,7 +109,6 @@
     opacity: 0;
     border-radius: 0 @border-radius-base @border-radius-base 0;
     transition: opacity 0.24s linear 0.1s;
-    z-index: 2; // https://github.com/ant-design/ant-design/issues/6289
   }
 
   &-handler-wrap:hover &-handler {