diff --git a/Cargo.lock b/Cargo.lock
index 161966d..8022b70 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2593,7 +2593,7 @@ dependencies = [
 
 [[package]]
 name = "grin-gui"
-version = "0.1.0-alpha.6"
+version = "0.1.0-alpha.7"
 dependencies = [
  "anyhow",
  "async-std",
@@ -2639,7 +2639,7 @@ dependencies = [
 
 [[package]]
 name = "grin-gui-core"
-version = "0.1.0-alpha.6"
+version = "0.1.0-alpha.7"
 dependencies = [
  "async-std",
  "backtrace",
diff --git a/Cargo.toml b/Cargo.toml
index bd47478..31509fa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin-gui"
-version = "0.1.0-alpha.6"
+version = "0.1.0-alpha.7"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "GUI wrapping grin and grin-wallet. Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
 license = "Apache-2.0"
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
index 7c67d75..85da0ac 100644
--- a/crates/core/Cargo.toml
+++ b/crates/core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "grin-gui-core"
 description = "Core GUI library for Grin GUI"
-version = "0.1.0-alpha.6"
+version = "0.1.0-alpha.7"
 authors = ["Yeastplume", "Casper Rogild Storm"]
 license = "GPL-3.0"
 homepage = "https://github.com/mimblewimble/grin-gui"
diff --git a/src/gui/mod.rs b/src/gui/mod.rs
index 20faec1..2f0ab6e 100644
--- a/src/gui/mod.rs
+++ b/src/gui/mod.rs
@@ -328,7 +328,7 @@ pub fn run(opts: Opts, config: Config) {
 	#[cfg(target_os = "macos")]
 	{
 		// false needed for Application shutdown
-		settings.windows.exit_on_close_request = false;
+		settings.window.exit_on_close_request = false;
 	}
 
 	#[cfg(target_os = "windows")]
diff --git a/src/gui/update.rs b/src/gui/update.rs
index b1ad7aa..2aef1da 100644
--- a/src/gui/update.rs
+++ b/src/gui/update.rs
@@ -289,6 +289,7 @@ pub fn handle_message(grin_gui: &mut GrinGui, message: Message) -> Result<Comman
 		#[cfg(target_os = "macos")]
 		// Application shutdown
 		Message::RuntimeEvent(iced_core::Event::Window(
+			iced_core::window::Id::MAIN,
 			iced_core::window::Event::CloseRequested,
 		)) => {
 			log::debug!("Message::RuntimeEvent(CloseRequested)");
@@ -306,7 +307,8 @@ pub fn handle_message(grin_gui: &mut GrinGui, message: Message) -> Result<Comman
 				if grin_gui.config.close_to_tray {
 					let _ = sender.try_send(TrayMessage::CloseToTray);
 				} else {
-					return Ok(window::close(iced_core::window::Id::MAIN));
+					grin_gui.show_exit(true);
+					//return Ok(window::close(iced_core::window::Id::MAIN));
 				}
 			}
 		}