diff --git a/app/assets/javascripts/gl_form.js.coffee b/app/assets/javascripts/gl_form.js.coffee
index d540cc4dc46..77512d187c9 100644
--- a/app/assets/javascripts/gl_form.js.coffee
+++ b/app/assets/javascripts/gl_form.js.coffee
@@ -34,6 +34,8 @@ class @GLForm
       # form and textarea event listeners
       @addEventListeners()
 
+      gl.text.init(@form)
+
     # hide discard button
     @form.find('.js-note-discard').hide()
 
@@ -42,6 +44,7 @@ class @GLForm
   clearEventListeners: ->
     @textarea.off 'focus'
     @textarea.off 'blur'
+    gl.text.removeListeners(@form)
 
   addEventListeners: ->
     @textarea.on 'focus', ->
diff --git a/app/assets/javascripts/lib/text_utility.js.coffee b/app/assets/javascripts/lib/text_utility.js.coffee
index 52ef001894c..bb2772dfed2 100644
--- a/app/assets/javascripts/lib/text_utility.js.coffee
+++ b/app/assets/javascripts/lib/text_utility.js.coffee
@@ -11,8 +11,18 @@
     text.substring(textarea.selectionStart, textarea.selectionEnd)
 
   gl.text.insertText = (textArea, text, tag, selected, wrap) ->
+    selectedSplit = selected.split('\n')
     startChar = if not wrap and textArea.selectionStart > 0 then '\n' else ''
-    insertText = "#{startChar}#{tag}#{selected}#{if wrap then tag else ' '}"
+
+    if selectedSplit.length > 1 and not wrap
+      insertText = selectedSplit.map((val) ->
+        if val.indexOf(tag) is 0
+          "#{val.replace(tag, '')}"
+        else
+          "#{tag}#{val}"
+      ).join('\n')
+    else
+      insertText = "#{startChar}#{tag}#{selected}#{if wrap then tag else ' '}"
 
     if document.queryCommandSupported('insertText')
       document.execCommand 'insertText', false, insertText
@@ -51,17 +61,19 @@
 
     @insertText(textArea, text, tag, selected, wrap)
 
-  gl.text.addListeners = ->
+  gl.text.init = (form) ->
     self = @
-    $('.js-md').on 'click', ->
-      $this = $(@)
-      self.updateText(
-        $this.closest('.md-area').find('textarea'),
-        $this.data('md-tag'),
-        not $this.data('md-prepend')
-      )
+    $('.js-md', form)
+      .off 'click'
+      .on 'click', ->
+        $this = $(@)
+        self.updateText(
+          $this.closest('.md-area').find('textarea'),
+          $this.data('md-tag'),
+          not $this.data('md-prepend')
+        )
 
-  gl.text.removeListeners = ->
-    $('.js-md').off()
+  gl.text.removeListeners = (form) ->
+    $('.js-md', form).off()
 
 ) window
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml
index 8ed0e3d7e1d..b151393abab 100644
--- a/app/views/projects/issues/_discussion.html.haml
+++ b/app/views/projects/issues/_discussion.html.haml
@@ -5,9 +5,3 @@
 
 #notes
   = render 'projects/notes/notes_with_form'
-
-:javascript
-  $(function(){
-    gl.text.removeListeners();
-    gl.text.addListeners();
-  })
\ No newline at end of file
diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml
index c8b6a25952b..393998f15b9 100644
--- a/app/views/projects/merge_requests/_discussion.html.haml
+++ b/app/views/projects/merge_requests/_discussion.html.haml
@@ -6,9 +6,3 @@
       = link_to 'Reopen merge request', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-nr btn-comment btn-grouped btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request", data: {original_text: "Reopen merge request", alternative_text: "Comment & reopen merge request"}
 
 #notes= render "projects/notes/notes_with_form"
-
-:javascript
-  $(function(){
-    gl.text.removeListeners();
-    gl.text.addListeners();
-  })
\ No newline at end of file