From 8096b59e214099d148fdcfa62c5a09cf1fa9b54a Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 22 Feb 2023 22:26:24 +0000
Subject: [PATCH] Merge pull request #10427 from
 AvaloniaUI/fixes/macos-close-window-zorder

macOS: Fix window order breaking when closing modal dialog
---
 native/Avalonia.Native/src/OSX/AvnWindow.mm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
index 13cb2011bb8..6b5f17759fd 100644
--- a/native/Avalonia.Native/src/OSX/AvnWindow.mm
+++ b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -291,12 +291,14 @@ - (void)windowDidBecomeKey:(NSNotification *_Nonnull)notification
 {
     if (_parent == nullptr)
         return;
-        
+    
     _parent->BringToFront();
     
     dispatch_async(dispatch_get_main_queue(), ^{
         @try {
-        [self invalidateShadow];
+            [self invalidateShadow];
+            if (self->_parent != nullptr)
+                self->_parent->BringToFront();
         }
         @finally{
         }