diff --git a/windows/WinUI/NetworkList.xaml b/windows/WinUI/NetworkListView.xaml
similarity index 99%
rename from windows/WinUI/NetworkList.xaml
rename to windows/WinUI/NetworkListView.xaml
index 6010a9908..f75b1dbeb 100644
--- a/windows/WinUI/NetworkList.xaml
+++ b/windows/WinUI/NetworkListView.xaml
@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
         xmlns:local="clr-namespace:WinUI"
-        mc:Ignorable="d" x:Class="WinUI.NetworkList"
+        mc:Ignorable="d" x:Class="WinUI.NetworkListView"
         Title="ZeroTier One" Height="500" Width="500" Icon="ZeroTierIcon.ico">
 	
     <Window.Resources>
diff --git a/windows/WinUI/NetworkList.xaml.cs b/windows/WinUI/NetworkListView.xaml.cs
similarity index 98%
rename from windows/WinUI/NetworkList.xaml.cs
rename to windows/WinUI/NetworkListView.xaml.cs
index ae5e1c8eb..6983a3fb5 100644
--- a/windows/WinUI/NetworkList.xaml.cs
+++ b/windows/WinUI/NetworkListView.xaml.cs
@@ -23,7 +23,7 @@ namespace WinUI
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
-    public partial class NetworkList : Window
+    public partial class NetworkListView : Window
     {
         Regex charRegex = new Regex("[0-9a-fxA-FX]");
         Regex wholeStringRegex = new Regex("^[0-9a-fxA-FX]+$");
@@ -32,7 +32,7 @@ namespace WinUI
 
         bool connected = false;
 
-        public NetworkList()
+        public NetworkListView()
         {
             InitializeComponent();
 
diff --git a/windows/WinUI/ToolbarItem.xaml.cs b/windows/WinUI/ToolbarItem.xaml.cs
index b3a1aafdf..d5cccbef3 100644
--- a/windows/WinUI/ToolbarItem.xaml.cs
+++ b/windows/WinUI/ToolbarItem.xaml.cs
@@ -26,7 +26,7 @@ namespace WinUI
     {
         private APIHandler handler = APIHandler.Instance;
 
-        NetworkList netList = null;
+        NetworkListView netList = null;
 
         public ToolbarItem()
         {
@@ -52,12 +52,8 @@ namespace WinUI
         {
             if (netList == null)
             {
-                netList = new WinUI.NetworkList();
+                netList = new WinUI.NetworkListView();
                 netList.Closed += ShowNetworksClosed;
-            }
-
-            if (!netList.IsVisible)
-            {
                 netList.Show();
             }
         }
diff --git a/windows/WinUI/WinUI.csproj b/windows/WinUI/WinUI.csproj
index 70e07ba37..a301463ab 100644
--- a/windows/WinUI/WinUI.csproj
+++ b/windows/WinUI/WinUI.csproj
@@ -115,7 +115,7 @@
     <Compile Include="ZeroTierPeer.cs" />
     <Compile Include="ZeroTierNetwork.cs" />
     <Compile Include="ZeroTierStatus.cs" />
-    <Page Include="NetworkList.xaml">
+    <Page Include="NetworkListView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -124,8 +124,8 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="NetworkList.xaml.cs">
-      <DependentUpon>NetworkList.xaml</DependentUpon>
+    <Compile Include="NetworkListView.xaml.cs">
+      <DependentUpon>NetworkListView.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
     <Page Include="NetworkInfoView.xaml">