diff --git a/src/background/mainWindow.js b/src/background/mainWindow.js
index f412fc9fc72f3f060c9f0912fb1e4497a5718539..c2caab0ef5cd8084a2d0cb445ccfc27f9ea6573c 100644
--- a/src/background/mainWindow.js
+++ b/src/background/mainWindow.js
@@ -41,6 +41,8 @@ const attachWindowStateHandling = (mainWindow) => {
 	});
 
 	const close = () => {
+		mainWindow.blur();
+
 		if (process.platform === 'darwin' || state.hideOnClose) {
 			mainWindow.hide();
 		} else if (process.platform === 'win32') {
diff --git a/src/scripts/events.js b/src/scripts/events.js
index 3e4bce715aae821c54bd5ed089cd482d6e060451..08dbdee60a734148be02bfc8dbe9184e6b1f34d1 100644
--- a/src/scripts/events.js
+++ b/src/scripts/events.js
@@ -173,8 +173,7 @@ export default () => {
 	webview.on('ipc-message-unread-changed', (hostUrl, [count]) => {
 		if (typeof count === 'number' && localStorage.getItem('showWindowOnUnreadChanged') === 'true') {
 			const mainWindow = remote.getCurrentWindow();
-			const isNeededToShow = !mainWindow.isFocused() || (mainWindow.isFocused() && !mainWindow.isVisible());
-			if (isNeededToShow) {
+			if (!mainWindow.isFocused()) {
 				mainWindow.once('focus', () => mainWindow.flashFrame(false));
 				mainWindow.showInactive();
 				mainWindow.flashFrame(true);