diff --git a/Elwig/Windows/MainWindow.xaml.cs b/Elwig/Windows/MainWindow.xaml.cs
index 26bea9f..9e59ffe 100644
--- a/Elwig/Windows/MainWindow.xaml.cs
+++ b/Elwig/Windows/MainWindow.xaml.cs
@@ -19,8 +19,15 @@ namespace Elwig.Windows {
         private void Window_Loaded(object sender, RoutedEventArgs evt) { }
 
         private void Window_Closing(object sender, CancelEventArgs evt) {
-            if (App.NumWindows > 1)
-                evt.Cancel = true;
+            if (App.NumWindows > 1) {
+                var res = MessageBox.Show("Es sind noch weitere Fenster geschlossen.\nSollen alle Fenster geschlossen werden?",
+                    "Elwig beenden", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+                if (res != MessageBoxResult.Yes) {
+                    evt.Cancel = true;
+                } else {
+                    Application.Current.Shutdown();
+                }
+            }
         }
 
         private void MemberAdminButton_Click(object sender, RoutedEventArgs evt) {