diff --git a/app/scripts/comp/browser/idle-tracker.js b/app/scripts/comp/browser/idle-tracker.js
index c7b8afda..ea317877 100644
--- a/app/scripts/comp/browser/idle-tracker.js
+++ b/app/scripts/comp/browser/idle-tracker.js
@@ -10,6 +10,7 @@ const IdleTracker = {
         const idleMinutes = (Date.now() - this.actionTime) / 1000 / 60;
         const maxIdleMinutes = AppSettingsModel.idleMinutes;
         if (maxIdleMinutes && idleMinutes > maxIdleMinutes) {
+            Events.emit('before-user-idle');
             Events.emit('user-idle');
         }
     },
diff --git a/app/scripts/views/fields/field-view-text.js b/app/scripts/views/fields/field-view-text.js
index 3b231d3b..8f79b3e3 100644
--- a/app/scripts/views/fields/field-view-text.js
+++ b/app/scripts/views/fields/field-view-text.js
@@ -61,7 +61,7 @@ class FieldViewText extends FieldView {
         Events.on('click', fieldValueBlurBound);
         this.stopBlurListener = () => Events.off('click', fieldValueBlurBound);
         this.listenTo(Events, 'main-window-will-close', this.externalEndEdit);
-        this.listenTo(Events, 'user-idle', this.externalEndEdit);
+        this.listenTo(Events, 'before-user-idle', this.externalEndEdit);
         if (this.model.multiline) {
             this.setInputHeight();
         }
diff --git a/release-notes.md b/release-notes.md
index bbb77b56..81125243 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -4,6 +4,7 @@ Release notes
 `-` fixed a performance issue in searching entries  
 `*` improved the "Show all file" checkbox behavior  
 `+` shortcut to copy OTP  
+`-` fixed several issues in field editing  
 `-` fix #1561: error during loading configs after reset  
 
 ##### v1.15.7 (2020-09-12)