diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 49f180e80..3f8871716 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -495,19 +495,20 @@ namespace Flow.Launcher
         private const int SC_MAXIMIZE = 0xF030;
         private const int SC_RESTORE = 0xF120;
         private const int SC_MINIMIZE = 0xF020;
-        
-        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
-        {
-            if (msg == Win32Helper.WM_ENTERSIZEMOVE)
-            {
-                _initialWidth = (int)Width;
+        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled) 
+        { 
+            if (msg == Win32Helper.WM_ENTERSIZEMOVE) 
+            { 
+                _initialWidth = (int)Width; 
                 _initialHeight = (int)Height;
-
                 handled = true;
             }
             else if (msg == Win32Helper.WM_EXITSIZEMOVE)
             {
-                if (_initialHeight != (int)Height)
+                //Prevent updating the number of results when the window height is below the height of a single result item.
+                //This situation occurs not only when the user manually resizes the window, but also when the window is released from a side snap, as the OS automatically adjusts the window height.
+                //(Without this check, releasing from a snap can cause the window height to hit the minimum, resulting in only 2 results being shown.)
+                if (_initialHeight != (int)Height && Height> (_settings.WindowHeightSize + _settings.ItemHeightSize))
                 {
                     if (!_settings.KeepMaxResults)
                     {
@@ -533,6 +534,11 @@ namespace Flow.Launcher
 
                     SizeToContent = SizeToContent.Height;
                 }
+                else
+                {
+                    // Update height when exiting maximized snap state.
+                    SizeToContent = SizeToContent.Height;
+                }
 
                 if (_initialWidth != (int)Width)
                 {
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
index 0c3e15c6d..06fbf403d 100644
--- a/Flow.Launcher/Themes/Win11Light.xaml
+++ b/Flow.Launcher/Themes/Win11Light.xaml
@@ -73,8 +73,9 @@
         BasedOn="{StaticResource BaseWindowBorderStyle}"
         TargetType="{x:Type Border}">
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="{DynamicResource SystemThemeBorder}" />
+        <Setter Property="BorderBrush" Value="{m:DynamicColor SystemControlBackgroundChromeMediumBrush}" />
         <Setter Property="Background" Value="{DynamicResource Color01B}" />
+        <Setter Property="CornerRadius" Value="8" />
         <Setter Property="UseLayoutRounding" Value="True" />
     </Style>
     <Style