diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index 70fd6f50e9c7e86d2b9ed347689273d2ba68e0e0..6efbe214aada2815d46be68afc1b25395635c3b9 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -35,7 +35,7 @@ class Dispatcher
         new Diff()
       when 'projects:issues:new','projects:issues:edit'
         shortcut_handler = new ShortcutsNavigation()
-        new DropzoneInput($('.issue-form'))
+        new GLForm($('.issue-form'))
         new IssuableForm($('.issue-form'))
       when 'projects:merge_requests:new', 'projects:merge_requests:edit'
         new Diff()
diff --git a/app/assets/javascripts/gl_form.js.coffee b/app/assets/javascripts/gl_form.js.coffee
index 087a46cbac241e1b4121f87921b93a87f1d219f0..aff3e909ce1cc751f1409f83564cb0ac2b83b875 100644
--- a/app/assets/javascripts/gl_form.js.coffee
+++ b/app/assets/javascripts/gl_form.js.coffee
@@ -1,7 +1,11 @@
 class @GLForm
   constructor: (@form) ->
-    @textarea = @form.find('.js-note-text')
+    @textarea = @form.find('textarea.js-gfm-input')
 
+    # Before we start, we should clean up any previous data for this form
+    @destroy()
+
+    # Setup the form
     @setupForm()
 
     @form.data 'gl-form', @
@@ -9,8 +13,10 @@ class @GLForm
   destroy: ->
     # Destroy actions
     actions = @form.data 'form-actions'
-    actions.clearEventListeners()
-    @form.data 'form-actions', null
+
+    if actions?
+      actions.clearEventListeners()
+      @form.data 'form-actions', null
 
     # Clean form listeners
     @clearEventListeners()
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index 33c48199ba589b3fff743d001117fd34f4bc2bb1..7076f5db015fe93af4e8994fcbbc694b8986c87b 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @issue], html: { class: 'form-horizontal issue-form gfm-form js-quick-submit js-requires-input' } do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @issue], html: { class: 'form-horizontal issue-form common-note-form js-quick-submit js-requires-input' } do |f|
   = render 'shared/issuable/form', f: f, issuable: @issue
 
 :javascript
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 6de07a92cd7297a4cdea3ae8e745c3bcbe5397ec..d77c74e5d7a972558fe3b19ef174186fb6c440e6 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -29,7 +29,7 @@
 
     = render layout: 'projects/md_preview', locals: { preview_class: "md-preview", referenced_users: true } do
       = render 'projects/zen', f: f, attr: :description,
-                               classes: 'description form-control'
+                               classes: 'note-textarea'
       = render 'projects/notes/hints'
       .clearfix
       .error-alert