diff --git a/app/scripts/comp/idle-tracker.js b/app/scripts/comp/idle-tracker.js
index 818843fa..d06a949d 100644
--- a/app/scripts/comp/idle-tracker.js
+++ b/app/scripts/comp/idle-tracker.js
@@ -13,11 +13,15 @@ const IdleTracker = {
             Backbone.trigger('user-idle');
         }
     },
+    osLock: function() {
+        Backbone.trigger('user-idle');
+    },
     regUserAction: function() {
         this.actionTime = Date.now();
     }
 };
 
 Backbone.on('power-monitor-resume', IdleTracker.checkIdle, IdleTracker);
+Backbone.on('os-lock', IdleTracker.osLock, IdleTracker);
 
 module.exports = IdleTracker;
diff --git a/desktop/app.js b/desktop/app.js
index 17956e59..e5e4844c 100644
--- a/desktop/app.js
+++ b/desktop/app.js
@@ -153,6 +153,9 @@ function createMainWindow() {
     mainWindow.on('enter-full-screen', () => {
         emitBackboneEvent('enter-full-screen');
     });
+    mainWindow.on('session-end', () => {
+        emitBackboneEvent('os-lock');
+    });
     restoreMainWindowPosition();
 }
 
diff --git a/release-notes.md b/release-notes.md
index 2c9e2414..bdf8ad66 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,5 +1,8 @@
 Release notes
 -------------
+##### v1.6.0 (WIP)
+`+` auto-lock when Windows is locked  
+
 ##### v1.5.3 (2017-05-29)
 `-` fix #638: password generator drag issues  
 `-` fix #636: broken layout in edge 15