diff --git a/Aerochat/Controls/BasicTitlebar.cs b/Aerochat/Controls/BasicTitlebar.cs
index e9a4252f..cbe3db51 100644
--- a/Aerochat/Controls/BasicTitlebar.cs
+++ b/Aerochat/Controls/BasicTitlebar.cs
@@ -152,6 +152,33 @@ protected override void OnInitialized(EventArgs e)
             if (Window != null)
             {
                 Window.SourceInitialized += Window_SourceInitialized;
+                Window.StateChanged += Window_StateChanged;
+            }
+        }
+
+        private void Window_StateChanged(object? sender, EventArgs e)
+        {
+            if (IsDwmEnabled) return;
+            if (Window.WindowState == WindowState.Maximized)
+            {
+                Titlebar.Visibility = Visibility.Collapsed;
+                WindowChrome.SetWindowChrome(Window, null);
+                FirstBorder.BorderThickness = new Thickness(0);
+                SecondBorder.BorderThickness = new Thickness(0);
+                // set the grid's first row to 0
+                Container.RowDefinitions[0].Height = new GridLength(0);
+            }
+            else
+            {
+                Titlebar.Visibility = Visibility.Visible;
+                WindowChrome chrome = new WindowChrome();
+                chrome.CaptionHeight = 28;
+                chrome.CornerRadius = new CornerRadius(6, 6, 0, 0);
+                chrome.GlassFrameThickness = new Thickness(0);
+                WindowChrome.SetWindowChrome(Window, chrome);
+                FirstBorder.BorderThickness = new Thickness(1);
+                SecondBorder.BorderThickness = new Thickness(1);
+                Container.RowDefinitions[0].Height = new GridLength(28);
             }
         }
 
diff --git a/Aerochat/Controls/NoDwmTitlebar.xaml b/Aerochat/Controls/NoDwmTitlebar.xaml
index f4a2f481..83c9dde7 100644
--- a/Aerochat/Controls/NoDwmTitlebar.xaml
+++ b/Aerochat/Controls/NoDwmTitlebar.xaml
@@ -15,7 +15,9 @@
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <Image Grid.Column="1" Source="{Binding Icon}" />
+                <Button WindowChrome.IsHitTestVisibleInChrome="True" MouseDoubleClick="Button_MouseDoubleClick" Grid.Column="1" Style="{StaticResource TransparentStyle}">
+                    <Image Source="{Binding Icon}" />
+                </Button>
                 <TextBlock Grid.Column="2" Foreground="{Binding TextColor}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0,0,0" Text="{Binding Title}">
                     <TextBlock.Style>
                         <Style TargetType="TextBlock">
diff --git a/Aerochat/Controls/NoDwmTitlebar.xaml.cs b/Aerochat/Controls/NoDwmTitlebar.xaml.cs
index 35e14102..facda5f6 100644
--- a/Aerochat/Controls/NoDwmTitlebar.xaml.cs
+++ b/Aerochat/Controls/NoDwmTitlebar.xaml.cs
@@ -48,5 +48,11 @@ private void Close_Click(object sender, RoutedEventArgs e)
             if (Window.GetWindow(this) is not Window window) return;
             window.Close();
         }
+
+        private void Button_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            if (Window.GetWindow(this) is not Window window) return;
+            window.Close();
+        }
     }
 }