diff --git a/src/PlanViewer.App/Dialogs/ConnectionDialog.axaml b/src/PlanViewer.App/Dialogs/ConnectionDialog.axaml
index 3b80a42..818c016 100644
--- a/src/PlanViewer.App/Dialogs/ConnectionDialog.axaml
+++ b/src/PlanViewer.App/Dialogs/ConnectionDialog.axaml
@@ -13,11 +13,33 @@
         <!-- Server Name -->
         <TextBlock Grid.Row="0" Text="Server name" Foreground="{DynamicResource ForegroundBrush}"
                    FontSize="12" Margin="0,0,0,4"/>
-        <AutoCompleteBox Grid.Row="1" x:Name="ServerNameBox"
-                         Watermark="e.g. sql2022 or server.database.windows.net"
-                         FontSize="13" Height="32" Margin="0,0,0,12"
-                         FilterMode="ContainsOrdinal"
-                         SelectionChanged="ServerName_SelectionChanged"/>
+        <Grid Grid.Row="1" x:Name="ServerNameGrid" ColumnDefinitions="*,Auto" Margin="0,0,0,12" ColumnSpacing="0">
+            <TextBox x:Name="ServerNameBox"
+                     Watermark="e.g. sql2022 or server.database.windows.net"
+                     FontSize="13" Height="32"/>
+            <Button Grid.Column="1" Click="DropdownButton_Click"
+                    Height="32" Width="32" Padding="0"
+                    Background="Black" CornerRadius="0,4,4,0"
+                    BorderBrush="White" BorderThickness="1">
+                <Path Data="M 0,0 L 4,4 L 8,0"
+                      Stroke="{DynamicResource ForegroundBrush}"
+                      StrokeThickness="1.5"
+                      VerticalAlignment="Center"
+                      HorizontalAlignment="Center"/>
+            </Button>
+            <Popup x:Name="ServerDropdown"
+                   PlacementTarget="{Binding #ServerNameGrid}"
+                   Placement="BottomEdgeAlignedLeft"
+                   IsLightDismissEnabled="True"
+                   MaxHeight="200">
+                <Border Background="{DynamicResource BackgroundBrush}"
+                        BorderBrush="#555" BorderThickness="1" CornerRadius="4">
+                    <ListBox x:Name="ServerList"
+                             SelectionChanged="ServerList_SelectionChanged"
+                             FontSize="13"/>
+                </Border>
+            </Popup>
+        </Grid>
 
         <!-- Authentication -->
         <TextBlock Grid.Row="2" Text="Authentication" Foreground="{DynamicResource ForegroundBrush}"
diff --git a/src/PlanViewer.App/Dialogs/ConnectionDialog.axaml.cs b/src/PlanViewer.App/Dialogs/ConnectionDialog.axaml.cs
index ddbb862..8a578e8 100644
--- a/src/PlanViewer.App/Dialogs/ConnectionDialog.axaml.cs
+++ b/src/PlanViewer.App/Dialogs/ConnectionDialog.axaml.cs
@@ -34,8 +34,12 @@ public ConnectionDialog(ICredentialService credentialService, ConnectionStore co
     private void PopulateSavedServers()
     {
         _savedConnections = _connectionStore.Load();
-        var serverNames = _savedConnections.Select(s => s.ServerName).Distinct().ToList();
-        ServerNameBox.ItemsSource = serverNames;
+        var serverNames = _savedConnections
+            .OrderByDescending(s => s.LastConnected)
+            .Select(s => s.ServerName)
+            .Distinct()
+            .ToList();
+        ServerList.ItemsSource = serverNames;
 
         // Pre-fill the most recently used connection
         var mostRecent = _savedConnections
@@ -84,12 +88,14 @@ private void ApplySavedConnection(ServerConnection saved)
         }
     }
 
-    // When the user picks a saved server from the autocomplete dropdown
-    private void ServerName_SelectionChanged(object? sender, SelectionChangedEventArgs e)
+    private void ServerList_SelectionChanged(object? sender, SelectionChangedEventArgs e)
     {
-        var serverName = ServerNameBox.SelectedItem?.ToString();
+        var serverName = ServerList.SelectedItem?.ToString();
         if (string.IsNullOrEmpty(serverName)) return;
 
+        ServerNameBox.Text = serverName;
+        ServerDropdown.IsOpen = false;
+
         var saved = _savedConnections.FirstOrDefault(s =>
             s.ServerName.Equals(serverName, StringComparison.OrdinalIgnoreCase));
 
@@ -190,6 +196,12 @@ private void Connect_Click(object? sender, RoutedEventArgs e)
         Close(true);
     }
 
+    private void DropdownButton_Click(object? sender, RoutedEventArgs e)
+    {
+        ServerDropdown.MinWidth = ServerNameGrid.Bounds.Width;
+        ServerDropdown.IsOpen = !ServerDropdown.IsOpen;
+    }
+
     private void Cancel_Click(object? sender, RoutedEventArgs e)
     {
         Close(false);
diff --git a/src/PlanViewer.App/PlanViewer.App.csproj b/src/PlanViewer.App/PlanViewer.App.csproj
index 1ab55a9..f59bb64 100644
--- a/src/PlanViewer.App/PlanViewer.App.csproj
+++ b/src/PlanViewer.App/PlanViewer.App.csproj
@@ -6,7 +6,7 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>EDD.ico</ApplicationIcon>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-    <Version>1.4.2</Version>
+    <Version>1.4.3</Version>
     <Authors>Erik Darling</Authors>
     <Company>Darling Data LLC</Company>
     <Product>Performance Studio</Product>