1 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/javascripts/blob/file_template_mediator.js b/app/assets/javascripts/blob/file_template_mediator.js
index 42b62e8ece4..115c4ee801b 100644
--- a/app/assets/javascripts/blob/file_template_mediator.js
+++ b/app/assets/javascripts/blob/file_template_mediator.js
@@ -91,7 +91,12 @@ export default class FileTemplateMediator {
 
   listenForFilenameInput() {
     this.$filenameInput.on('keyup blur', () => {
-      this.displayMatchedTemplateSelector();
+      if(this.isFilenameEmpty()) {
+        this.clearEditorContent()
+        this.hideTemplateSelectorMenu()
+      } else {
+        this.displayMatchedTemplateSelector();
+      }
     });
   }
 
@@ -255,6 +260,10 @@ export default class FileTemplateMediator {
     this.$filenameInput.val(filename)
   }
 
+  isFilenameEmpty() {
+    return this.getFilename() === ""
+  }
+
   getSelected() {
     return this.templateSelectors.find(selector => selector.selected);
   }