diff --git a/app/scripts/auto-type/index.js b/app/scripts/auto-type/index.js
index 5b30e5f9..c5e9fafd 100644
--- a/app/scripts/auto-type/index.js
+++ b/app/scripts/auto-type/index.js
@@ -28,6 +28,7 @@ const AutoType = {
         Events.on('auto-type', e => this.handleEvent(e));
         Events.on('main-window-blur', e => this.resetPendingEvent(e));
         Events.on('main-window-will-close', e => this.resetPendingEvent(e));
+        appModel.files.on('change', () => this.processPendingEvent());
     },
 
     handleEvent(e) {
@@ -209,7 +210,6 @@ const AutoType = {
             const evt = { filter, windowInfo };
             if (!this.appModel.files.hasOpenFiles()) {
                 this.pendingEvent = evt;
-                this.appModel.files.once('change', this.processPendingEvent, this);
                 logger.debug('auto-type event delayed');
                 this.focusMainWindow();
             } else {
@@ -262,7 +262,6 @@ const AutoType = {
     resetPendingEvent() {
         if (this.pendingEvent) {
             this.pendingEvent = null;
-            this.appModel.files.off('change', this.processPendingEvent, this);
             logger.debug('auto-type event cancelled');
         }
     },
@@ -273,7 +272,6 @@ const AutoType = {
         }
         logger.debug('processing pending auto-type event');
         const evt = this.pendingEvent;
-        this.appModel.files.off('change', this.processPendingEvent, this);
         this.pendingEvent = null;
         this.processEventWithFilter(evt);
     }
diff --git a/release-notes.md b/release-notes.md
index b68a058f..e47e4446 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -2,6 +2,7 @@ Release notes
 -------------
 ##### v1.11.4 (2019-09-29)
 `-` fix #1277: auto-type window matching on Linux  
+`-` fix #1278: entry selection auto-type window issues  
 `-` fixed displaying errors on the plugins page  
 
 ##### v1.11.3 (2019-09-29)