diff --git a/src/components/input/input.scss b/src/components/input/input.scss
index 2080e8ecd0e..e2797747d5c 100644
--- a/src/components/input/input.scss
+++ b/src/components/input/input.scss
@@ -96,7 +96,9 @@ input.text-input:-webkit-autofill {
}
.input-has-focus input,
-.input-has-focus textarea {
+.input-has-focus textarea,
+.input-has-focus a,
+.input-has-focus button {
pointer-events: auto;
}
@@ -136,7 +138,7 @@ input.text-input:-webkit-autofill {
background-position: center;
}
-.input-has-value .text-input-clear-icon {
+.input-has-focus.input-has-value .text-input-clear-icon {
display: block;
}
diff --git a/src/components/input/test/clear-input/main.html b/src/components/input/test/clear-input/main.html
index ade465cb5a7..b1d68b8f097 100644
--- a/src/components/input/test/clear-input/main.html
+++ b/src/components/input/test/clear-input/main.html
@@ -22,6 +22,10 @@
+
+
+
+