diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcfdf08a..a7bc80fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,13 @@ Release date: TBD
 #### All Platforms
 - Fixed an issue where an unexpected row appeared after switching channels with `CTRL+K` shortcut. [#426](https://github.com/mattermost/desktop/issues/426)
 
+#### Windows
+- Fixed an issue where the main window still has focus and exists
+  in the classic Alt+Tab switcher after it's closed.
+  [#430](https://github.com/mattermost/desktop/issues/430)
+  [#431](https://github.com/mattermost/desktop/issues/431)
+
+
 ----
 
 ## Release v3.6.0
diff --git a/src/main.js b/src/main.js
index 2e3261c2..d5729ee5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -529,8 +529,8 @@ app.on('ready', () => {
     } else { // Minimize or hide the window for close button.
       event.preventDefault();
       function hideWindow(window) {
-        window.hide();
         window.blur(); // To move focus to the next top-level window in Windows
+        window.hide();
       }
       switch (process.platform) {
       case 'win32':