diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index 56ac2d87c..2b7a49f0d 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -855,9 +855,6 @@ namespace BeWo
 		{
 			if (MainControl != null)
 			{
-				
-
-
 				MainControl.Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action) (() =>
 				{
 					UserControl exControl = null;
@@ -1158,7 +1155,11 @@ namespace BeWo
 		        {
 		            abc.Close();
                 }
-		    }
+				else if (abc.Title.IndexOf("Popup") >= 0)
+				{
+					abc.Close();
+				}
+			}
 
             MainControl.HideCurrentModalViewWindows();
 
diff --git a/BeWo/View/BeWoWindowBuilder.cs b/BeWo/View/BeWoWindowBuilder.cs
index c4f934be4..4ded5d01a 100644
--- a/BeWo/View/BeWoWindowBuilder.cs
+++ b/BeWo/View/BeWoWindowBuilder.cs
@@ -72,6 +72,7 @@ namespace BeWo.View
 
             beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
             beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
+            beWoWindow.Title = "Popup";
             beWoWindow.rootGroupBox.Header = title;
 
             return beWoWindow;