diff --git a/packages/input/src/index.vue b/packages/input/src/index.vue
index 628f40d478..35d6bb6ebe 100644
--- a/packages/input/src/index.vue
+++ b/packages/input/src/index.vue
@@ -10,7 +10,8 @@
         'el-input-group--append': $slots.append,
         'el-input-group--prepend': $slots.prepend,
         'el-input--prefix': $slots.prefix || prefixIcon,
-        'el-input--suffix': $slots.suffix || suffixIcon || clearable || showPassword
+        'el-input--suffix': $slots.suffix || suffixIcon || clearable || showPassword,
+        'el-input--suffix--password-clear': clearable && showPassword
       },
       $attrs.class
     ]"
diff --git a/packages/theme-chalk/src/input.scss b/packages/theme-chalk/src/input.scss
index 15362b0498..9614e33293 100644
--- a/packages/theme-chalk/src/input.scss
+++ b/packages/theme-chalk/src/input.scss
@@ -220,6 +220,12 @@
     .#{$namespace}-input__inner {
       padding-right: 30px;
     }
+
+    @include m(password-clear) {
+      .#{$namespace}-input__inner {
+        padding-right: 55px;
+      }
+    }
   }
 
   @include m(prefix) {