diff --git a/index.js b/index.js
index 8b687673..9bb581ea 100644
--- a/index.js
+++ b/index.js
@@ -286,7 +286,8 @@ app.on("ready", () => {
 			// Hide the window instead of quitting (quit is available in tray options)
 			if (!forceQuit) {
 				event.preventDefault();
-				mainWindow.hide();
+				mainWindow.minimize()
+				mainWindow.setSkipTaskbar(true);
 			}
 		});
 	}
diff --git a/tray.js b/tray.js
index 75af7494..234ac6e7 100644
--- a/tray.js
+++ b/tray.js
@@ -27,8 +27,12 @@ module.exports.setUpTray = (app, win) => {
 	tray.on("click", () => {
 		if (config.get("options.trayClickPlayPause")) {
 			playPause();
+		} else if(win.isMinimized()){
+			win.restore();
+			win.setSkipTaskbar(false);
 		} else {
-			win.isVisible() ? win.hide() : win.show();
+			win.minimize()
+			win.setSkipTaskbar(true);
 		}
 	});
 
@@ -54,7 +58,9 @@ module.exports.setUpTray = (app, win) => {
 		{
 			label: "Show",
 			click: () => {
-				win.show();
+				win.restore();
+				win.focus();
+				win.setSkipTaskbar(false);
 			},
 		},
 		...mainMenuTemplate(win),