diff --git a/app/assets/javascripts/app/views/channel/chat.jst.eco b/app/assets/javascripts/app/views/channel/chat.jst.eco
index bc5dbee37..c16bdee10 100644
--- a/app/assets/javascripts/app/views/channel/chat.jst.eco
+++ b/app/assets/javascripts/app/views/channel/chat.jst.eco
@@ -63,7 +63,7 @@
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index fd181a115..03aec776d 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -7439,10 +7439,22 @@ output {
.browser-input {
flex: 1;
- margin-right: 10px;
+ position: relative;
input {
min-width: 0;
+ padding-right: 40px;
+ }
+
+ .loading.icon {
+ position: absolute;
+ right: 11px;
+ top: 11px;
+ display: none;
+ }
+
+ &.is-loading .loading.icon {
+ display: block;
}
}