diff --git a/app/assets/javascripts/app/lib/base/jquery.textmodule.js b/app/assets/javascripts/app/lib/base/jquery.textmodule.js
index dd56721d6..2764f5657 100644
--- a/app/assets/javascripts/app/lib/base/jquery.textmodule.js
+++ b/app/assets/javascripts/app/lib/base/jquery.textmodule.js
@@ -262,7 +262,7 @@
 
   // paste some content
   Plugin.prototype.paste = function(string) {
-    string = App.Utils.text2html(string) + '<br>'
+    string = App.Utils.text2html(string)
     if (document.selection) { // IE
       var range = document.selection.createRange()
       range.pasteHTML(string)
@@ -397,6 +397,9 @@
       if (i == result.length-1) {
         element.addClass('is-active')
       }
+      if (item.keywords) {
+        element.append($('<kbd>').text(App.Utils.htmlEscape(item.keywords)))
+      }
       this.$widget.find('ul').append(element)
     }
     
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index fb8886c06..3817a81e0 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -5486,6 +5486,16 @@ footer {
   overflow: hidden;
 }
 
+  .dropdown-menu kbd {
+    background: none;
+    color: inherit;
+    padding: 2px 5px;
+    margin-left: 7px;
+    line-height: 1;
+    vertical-align: baseline;
+    opacity: 0.5;
+  }
+
   .dropdown-toggle {
     display: flex;
     align-items: center;