diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index ed1bdd6ca33a70d6f32d13514527be7c5c93fc32..591a3749a935f9c6cdab5d4306b1bf298efc824f 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -33,12 +33,16 @@ class Dispatcher
         shortcut_handler = new ShortcutsNavigation()
         new ZenMode()
         new DropzoneInput($('.issue-form'))
+        if page == 'projects:issues:new'
+          new IssuableForm($('.issue-form'))
       when 'projects:merge_requests:new', 'projects:merge_requests:edit'
         GitLab.GfmAutoComplete.setup()
         new Diff()
         shortcut_handler = new ShortcutsNavigation()
         new ZenMode()
         new DropzoneInput($('.merge-request-form'))
+        if page == 'projects:merge_requests:new'
+          new IssuableForm($('.merge-request-form'))
       when 'projects:merge_requests:show'
         new Diff()
         shortcut_handler = new ShortcutsIssueable()
diff --git a/app/assets/javascripts/issuable_form.js.coffee b/app/assets/javascripts/issuable_form.js.coffee
new file mode 100644
index 0000000000000000000000000000000000000000..abd58bcf9783bd3b801dfe5f214a4d34553a7ccc
--- /dev/null
+++ b/app/assets/javascripts/issuable_form.js.coffee
@@ -0,0 +1,28 @@
+class @IssuableForm
+  constructor: (@form) ->
+    @titleField       = @form.find("input[name*='[title]']")
+    @descriptionField = @form.find("textarea[name*='[description]']")
+
+    return unless @titleField.length && @descriptionField.length
+
+    @initAutosave()
+
+    @form.on "submit", @resetAutosave
+    @form.on "click", ".btn-cancel", @resetAutosave
+
+  initAutosave: ->
+    new Autosave @titleField, [
+      document.location.pathname,
+      document.location.search,
+      "title"
+    ]
+
+    new Autosave @descriptionField, [
+      document.location.pathname,
+      document.location.search,
+      "description"
+    ]
+
+  resetAutosave: =>
+    @titleField.data("autosave").reset()
+    @descriptionField.data("autosave").reset()