diff --git a/DesktopEdge/MainMenu.xaml.cs b/DesktopEdge/MainMenu.xaml.cs
index ed405bdf..cc7f772b 100644
--- a/DesktopEdge/MainMenu.xaml.cs
+++ b/DesktopEdge/MainMenu.xaml.cs
@@ -142,8 +142,7 @@ namespace ZitiDesktopEdge
 		}
 		private void ShowFeedback(object sender, MouseButtonEventArgs e) {
 			ServiceClient.Client client = (ServiceClient.Client)Application.Current.Properties["ServiceClient"];
-			var mailMessage = new MailMessage();
-			mailMessage.From = new MailAddress("ziti-support@netfoundry.io");
+			var mailMessage = new MailMessage("", "ziti-support@netfoundry.io");
 			mailMessage.Subject = "Ziti Support";
 			mailMessage.IsBodyHtml = true;
 			mailMessage.Body = "";
@@ -193,6 +192,7 @@ namespace ZitiDesktopEdge
 			DetachButton.Visibility = Visibility.Collapsed;
 			AttachButton.Visibility = Visibility.Visible;
 			Arrow.Visibility = Visibility.Collapsed;
+			UIModel.HideOnLostFocus = false;
 			if (OnAttachmentChange != null) {
 				OnAttachmentChange(false);
 			}
@@ -210,6 +210,7 @@ namespace ZitiDesktopEdge
 			DetachButton.Visibility = Visibility.Visible;
 			AttachButton.Visibility = Visibility.Collapsed;
 			Arrow.Visibility = Visibility.Visible;
+			UIModel.HideOnLostFocus = true;
 			if (OnAttachmentChange != null) {
 				OnAttachmentChange(true);
 			}
diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs
index a69a9ae5..badd9d52 100644
--- a/DesktopEdge/MainWindow.xaml.cs
+++ b/DesktopEdge/MainWindow.xaml.cs
@@ -85,11 +85,13 @@ namespace ZitiDesktopEdge {
 		}
 
 		private void MainWindow_Deactivated(object sender, EventArgs e) {
+			if (UIModel.HideOnLostFocus) {
 #if DEBUG
 				Debug.WriteLine("debug is enabled - windows pinned");
 #else
 				this.Visibility = Visibility.Collapsed;
 #endif
+			}
 		}
 
 		private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e) {
@@ -113,6 +115,7 @@ namespace ZitiDesktopEdge {
 				_isAttached = false;
 				IdentityMenu.Arrow.Visibility = Visibility.Collapsed;
 				Arrow.Visibility = Visibility.Collapsed;
+				UIModel.HideOnLostFocus = false;
 				MainMenu.Detach();
 				this.DragMove();
 			}