diff --git a/src/browser/webview/mattermost.js b/src/browser/webview/mattermost.js
index f56c6526..d2c95725 100644
--- a/src/browser/webview/mattermost.js
+++ b/src/browser/webview/mattermost.js
@@ -52,7 +52,13 @@ function overrideNotification() {
   };
   Notification.prototype.__defineSetter__('onclick', function(callback) {
     this.notification.onclick = function() {
-      electron.remote.getCurrentWindow().show();
+      if (process.platform === 'win32') {
+        // show() breaks Aero Snap state.
+        electron.remote.getCurrentWindow().focus();
+      }
+      else {
+        electron.remote.getCurrentWindow().show();
+      }
       ipc.sendToHost('onNotificationClick');
       callback();
     };