diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest
index 4eb5ffa..157b2b0 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest	
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest	
@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.1.171.0" />
+	  Version="1.1.172.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsWindowStatusExtensions.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsWindowStatusExtensions.cs
index f1afee5..a39adef 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsWindowStatusExtensions.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsWindowStatusExtensions.cs
@@ -73,8 +73,6 @@ namespace BetterLyrics.WinUI3.Extensions
             var status = new LyricsWindowStatus(window)
             {
                 Name = _resourceService.GetLocalizedString("FullscreenMode"),
-                IsAlwaysOnTop = true,
-                TitleBarArea = TitleBarArea.None,
                 LyricsLayoutOrientation = LyricsLayoutOrientation.Vertical,
                 LyricsStyleSettings = new LyricsStyleSettings
                 {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs
index 1e1c406..5210b44 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs
@@ -283,6 +283,8 @@ namespace BetterLyrics.WinUI3.Hooks
 
         public static void SetIsFullscreen(this Window window, bool enable)
         {
+            if (window.AppWindow == null) return;
+
             if (enable)
             {
                 window.AppWindow.SetPresenter(AppWindowPresenterKind.FullScreen);
@@ -295,6 +297,8 @@ namespace BetterLyrics.WinUI3.Hooks
 
         public static void SetIsMaximized(this Window window, bool enable)
         {
+            if (window.AppWindow == null) return;
+
             if (enable)
             {
                 window.Maximize();
@@ -312,6 +316,8 @@ namespace BetterLyrics.WinUI3.Hooks
 
         public static void SetIsAlwaysOnTop(this Window window, bool enable)
         {
+            if (window.AppWindow == null) return;
+
             if (window.AppWindow.Presenter is OverlappedPresenter presenter)
             {
                 presenter.IsAlwaysOnTop = enable;
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs
index 63e6467..2b33235 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs
@@ -176,6 +176,9 @@ namespace BetterLyrics.WinUI3.Views
             this.SetIsFullscreen(LyricsWindowStatus.IsFullscreen);
             EnterFullscreenFontIcon.Opacity = LyricsWindowStatus.IsFullscreen ? 0 : 1;
             ExitFullscreenFontIcon.Opacity = LyricsWindowStatus.IsFullscreen ? 1 : 0;
+            MaximizeButton.Visibility = LyricsWindowStatus.IsFullscreen ? Visibility.Collapsed : Visibility.Visible;
+            AOTButton.Visibility = LyricsWindowStatus.IsFullscreen ? Visibility.Collapsed : Visibility.Visible;
+            MinimizeButton.Visibility = LyricsWindowStatus.IsFullscreen ? Visibility.Collapsed : Visibility.Visible;
         }
 
         private void OnIsMaximizedChanged()