From 52de38d8a1c1c28b848b37f735c2347daf90986c Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 22 Feb 2021 21:58:42 +0000
Subject: [PATCH 1/3] fix handling of becomeKeyWindow on OSX.

---
 native/Avalonia.Native/src/OSX/window.mm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index 9d49025398..7fa6614d4d 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -2068,17 +2068,17 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 
 -(void)becomeKeyWindow
 {
+    [self showWindowMenuWithAppMenu];
+    
     if([self activateAppropriateChild: true])
     {
-        [self showWindowMenuWithAppMenu];
-        
         if(_parent != nullptr)
         {
             _parent->BaseEvents->Activated();
         }
-        
-        [super becomeKeyWindow];
     }
+    
+    [super becomeKeyWindow];
 }
 
 -(void) restoreParentWindow;

From 52a3b6ef19e9b74983264f019d2f7184d418659c Mon Sep 17 00:00:00 2001
From: Jeffrey Ye <lightning.x.revenant@gmail.com>
Date: Mon, 22 Feb 2021 23:50:14 -0800
Subject: [PATCH 2/3] Fix #5541

---
 src/Avalonia.Dialogs/ManagedFileChooserSources.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Avalonia.Dialogs/ManagedFileChooserSources.cs b/src/Avalonia.Dialogs/ManagedFileChooserSources.cs
index 0dc024c4dd..5f2bd7a9cd 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserSources.cs
+++ b/src/Avalonia.Dialogs/ManagedFileChooserSources.cs
@@ -71,6 +71,10 @@ namespace Avalonia.Dialogs
                        {
                            return null;
                        }
+                       catch (DirectoryNotFoundException _)
+                       {
+                           return null;
+                       }
 
                        return new ManagedFileChooserNavigationItem
                        {

From ad6b76be7f9eb11a5bfcb32087296e0b9362299d Mon Sep 17 00:00:00 2001
From: Jeffrey Ye <lightning.x.revenant@gmail.com>
Date: Tue, 23 Feb 2021 00:26:46 -0800
Subject: [PATCH 3/3] ignore all exceptions

---
 src/Avalonia.Dialogs/ManagedFileChooserSources.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Avalonia.Dialogs/ManagedFileChooserSources.cs b/src/Avalonia.Dialogs/ManagedFileChooserSources.cs
index 5f2bd7a9cd..050d618ce1 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserSources.cs
+++ b/src/Avalonia.Dialogs/ManagedFileChooserSources.cs
@@ -67,11 +67,7 @@ namespace Avalonia.Dialogs
                        {
                            Directory.GetFiles(x.VolumePath);
                        }
-                       catch (UnauthorizedAccessException _)
-                       {
-                           return null;
-                       }
-                       catch (DirectoryNotFoundException _)
+                       catch (Exception _)
                        {
                            return null;
                        }