diff --git a/app/views/notes/_common_form.html.haml b/app/views/notes/_common_form.html.haml
index f91e921b..626a448c 100644
--- a/app/views/notes/_common_form.html.haml
+++ b/app/views/notes/_common_form.html.haml
@@ -39,6 +39,12 @@
 
 :javascript
   $(function(){
-    var names = #{@project.users.pluck(:name)};
-    $('.note-text').atWho('@', { data: names });
+    var names = #{@project.users.pluck(:name)}, emoji = ['+1', '-1'];
+    var emoji = $.map(emoji, function(value, i) {return {key:value + ':', name:value}});
+    $('#note_note').
+      atWho('@', { data: names }).
+      atWho(':', {
+        data: emoji,
+        tpl: "<li data-value='${key}'>${name} #{escape_javascript image_tag('emoji/${name}.png', :size => '20x20')}</li>"
+      });
   });