diff --git a/app/assets/javascripts/app/views/generic/attribute.jst.eco b/app/assets/javascripts/app/views/generic/attribute.jst.eco
index 18f4b1fa1..daacf50a0 100644
--- a/app/assets/javascripts/app/views/generic/attribute.jst.eco
+++ b/app/assets/javascripts/app/views/generic/attribute.jst.eco
@@ -1,7 +1,8 @@
 <div class="control-group <%= @attribute.item_class %>">
-  <label class="control-label" for="<%= @attribute.id %>"><%- T(@attribute.display) %><% if !@attribute.null: %> *<% end %></label>
+  <label class="control-label" for="<%= @attribute.id %>"><%- T(@attribute.display) %><% if !@attribute.null: %> *<% end %>
+  </label>
   <div class="controls">    
-    <%- @item %>
+    <%- @item %><% if @attribute.note: %><span class="icon-question-sign" title="<%- T(@attribute.note) + ' ' %>"></span><% end %>
     <span class="help-inline"></span>
     <span class="help-block"><% if @attribute.help: %><%- T(@attribute.help) + ' ' %><% end %><%- @attribute.link %></span>
   </div>