Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

1 files changed, 14 insertions, 0 deletions

diff --git a/windows/WinUI/ToolbarItem.xaml.cs b/windows/WinUI/ToolbarItem.xaml.cs
index 6ecac6c2..29791a4e 100644
--- a/windows/WinUI/ToolbarItem.xaml.cs
+++ b/windows/WinUI/ToolbarItem.xaml.cs
@@ -138,6 +138,8 @@ namespace WinUI
                 netListLocation.X = netListView.Left;
                 netListLocation.Y = netListView.Top;
             }
+
+            netListView.Activate();
         }
 
         private void ShowNetworksClosed(object sender, System.EventArgs e)
@@ -169,6 +171,10 @@ namespace WinUI
                     joinNetLocation.Y = joinNetView.Top;
                 }
             }
+            else
+            {
+                joinNetView.Activate();
+            }
         }
 
         private void JoinNetworkClosed(object sender, System.EventArgs e)
@@ -200,6 +206,10 @@ namespace WinUI
                     aboutViewLocation.Y = aboutView.Top;
                 }
             }
+            else
+            {
+                aboutView.Activate();
+            }
         }
 
         private void AboutClosed(object sender, System.EventArgs e)
@@ -231,6 +241,10 @@ namespace WinUI
                     prefsViewLocation.Y = prefsView.Top;
                 }
             }
+            else
+            {
+                prefsView.Activate();
+            }
         }
 
         private void PreferencesClosed(object sender, System.EventArgs e)