diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee
index 203a5b67..f68a029d 100644
--- a/app/assets/javascripts/gfm_auto_complete.js.coffee
+++ b/app/assets/javascripts/gfm_auto_complete.js.coffee
@@ -22,14 +22,14 @@ window.setupGfmAutoComplete = ->
   ###
     Emoji
   ###
-  $('.gfm-input').atWho ':',
+  $('.js-gfm-input').atWho ':',
     data: autocompleteEmojiData,
     tpl: autocompleteEmojiTemplate
 
   ###
     Team Members
   ###
-  $('.gfm-input').atWho '@', (query, callback) ->
+  $('.js-gfm-input').atWho '@', (query, callback) ->
     (getMoreMembers = ->
       $.getJSON(autocompleteMembersUrl, autocompleteMembersParams)
         .success (members) ->
@@ -45,7 +45,7 @@ window.setupGfmAutoComplete = ->
           # are we past the last page?
           if newMembersData.length == 0
             # set static data and stop callbacks
-            $('.gfm-input').atWho '@',
+            $('.js-gfm-input').atWho '@',
               data: autocompleteMembersData
               callback: null
           else
@@ -54,4 +54,4 @@ window.setupGfmAutoComplete = ->
 
       # so the next request gets the next page
       autocompleteMembersParams.page += 1;
-    ).call();
\ No newline at end of file
+    ).call();
diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml
index ec3edce0..3e2cacbb 100644
--- a/app/views/issues/_form.html.haml
+++ b/app/views/issues/_form.html.haml
@@ -12,7 +12,7 @@
           = f.label :title do
             %strong= "Subject *"
           .input
-            = f.text_field :title, maxlength: 255, class: "xxlarge gfm-input"
+            = f.text_field :title, maxlength: 255, class: "xxlarge js-gfm-input"
       .issue_middle_block
         .issue_assignee
           = f.label :assignee_id do
@@ -37,7 +37,7 @@
         .clearfix
           = f.label :description, "Details"
           .input
-            = f.text_area :description, maxlength: 2000, class: "xxlarge gfm-input", rows: 14
+            = f.text_area :description, maxlength: 2000, class: "xxlarge js-gfm-input", rows: 14
             %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
 
 
diff --git a/app/views/merge_requests/_form.html.haml b/app/views/merge_requests/_form.html.haml
index 30f88102..c420fac2 100644
--- a/app/views/merge_requests/_form.html.haml
+++ b/app/views/merge_requests/_form.html.haml
@@ -30,12 +30,12 @@
   .clearfix
     .main_box
       .top_box_content
-        = f.label :title do 
+        = f.label :title do
           %strong= "Title *"
-        .input= f.text_field :title, class: "input-xxlarge pad gfm-input", maxlength: 255, rows: 5
+        .input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5
       .middle_box_content
-        = f.label :assignee_id do 
-          %i.icon-user 
+        = f.label :assignee_id do
+          %i.icon-user
           Assign to
         .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'})
 
diff --git a/app/views/notes/_common_form.html.haml b/app/views/notes/_common_form.html.haml
index a9f2907b..0725082d 100644
--- a/app/views/notes/_common_form.html.haml
+++ b/app/views/notes/_common_form.html.haml
@@ -8,7 +8,7 @@
 
     = f.hidden_field :noteable_id
     = f.hidden_field :noteable_type
-    = f.text_area :note, size: 255, class: 'note-text gfm-input'
+    = f.text_area :note, size: 255, class: 'note-text js-gfm-input'
     #preview-note.preview_note.hide
     .hint
       .right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
diff --git a/app/views/notes/_per_line_form.html.haml b/app/views/notes/_per_line_form.html.haml
index ee0cde4b..c8d79850 100644
--- a/app/views/notes/_per_line_form.html.haml
+++ b/app/views/notes/_per_line_form.html.haml
@@ -13,7 +13,7 @@
             = f.hidden_field :noteable_id
             = f.hidden_field :noteable_type
             = f.hidden_field :line_code
-            = f.text_area :note,  size: 255, class: 'line-note-text gfm-input'
+            = f.text_area :note,  size: 255, class: 'line-note-text js-gfm-input'
             .note_actions
               .buttons
                 = f.submit 'Add note', class: "btn save-btn submit_note submit_inline_note", id: "submit_note"
diff --git a/app/views/wikis/_form.html.haml b/app/views/wikis/_form.html.haml
index 89bbe2ea..83b16b13 100644
--- a/app/views/wikis/_form.html.haml
+++ b/app/views/wikis/_form.html.haml
@@ -21,7 +21,7 @@
 
     .bottom_box_content
       = f.label :content
-      .input= f.text_area :content, class: 'span8 gfm-input'
+      .input= f.text_area :content, class: 'span8 js-gfm-input'
   .actions
     = f.submit 'Save', class: "save-btn btn"
     = link_to "Cancel", project_wiki_path(@project, :index), class: "btn cancel-btn"