1 files changed, 14 insertions, 2 deletions

diff --git a/app/assets/javascripts/issuable/issuable_template_selector.js b/app/assets/javascripts/issuable/issuable_template_selector.js
index cce903d388d..6b8f3de8d49 100644
--- a/app/assets/javascripts/issuable/issuable_template_selector.js
+++ b/app/assets/javascripts/issuable/issuable_template_selector.js
@@ -17,7 +17,15 @@ export default class IssuableTemplateSelector extends TemplateSelector {
       name: this.dropdown.data('selected'),
     };
 
-    if (initialQuery.name) this.requestFile(initialQuery);
+    // Only use the default template if we don't have description data from autosave
+    if (!initialQuery.name && this.dropdown.data('default') && !this.editor.getValue().length) {
+      initialQuery.name = this.dropdown.data('default');
+    }
+
+    if (initialQuery.name) {
+      this.requestFile(initialQuery);
+      this.setToggleText(initialQuery.name);
+    }
 
     $('.reset-template', this.dropdown.parent()).on('click', () => {
       this.setInputValueToTemplateContent();
@@ -53,10 +61,14 @@ export default class IssuableTemplateSelector extends TemplateSelector {
     }
 
     this.setInputValueToTemplateContent();
-    $('.dropdown-toggle-text', this.dropdown).text(__('Choose a template'));
+    this.setToggleText(__('Choose a template'));
     this.previousSelectedIndex = null;
   }
 
+  setToggleText(text) {
+    $('.dropdown-toggle-text', this.dropdown).text(text);
+  }
+
   setSelectedIndex() {
     this.previousSelectedIndex = this.dropdown.data('deprecatedJQueryDropdown').selectedIndex;
   }