diff --git a/src/ShadUI.Demo/ViewModels/AvatarViewModel.cs b/src/ShadUI.Demo/ViewModels/AvatarViewModel.cs
index 65df69b..737f3ec 100644
--- a/src/ShadUI.Demo/ViewModels/AvatarViewModel.cs
+++ b/src/ShadUI.Demo/ViewModels/AvatarViewModel.cs
@@ -26,7 +26,7 @@ private void BackPage()
     [RelayCommand]
     private void NextPage()
     {
-        _pageManager.Navigate<ButtonViewModel>();
+        _pageManager.Navigate<BadgeViewModel>();
     }
 
     [ObservableProperty]
diff --git a/src/ShadUI.Demo/ViewModels/ButtonViewModel.cs b/src/ShadUI.Demo/ViewModels/ButtonViewModel.cs
index c1ca07e..2fd7cb8 100644
--- a/src/ShadUI.Demo/ViewModels/ButtonViewModel.cs
+++ b/src/ShadUI.Demo/ViewModels/ButtonViewModel.cs
@@ -27,7 +27,7 @@ public ButtonViewModel(PageManager pageManager)
     [RelayCommand]
     private void BackPage()
     {
-        _pageManager.Navigate<AvatarViewModel>();
+        _pageManager.Navigate<BadgeViewModel>();
     }
 
     [RelayCommand]
diff --git a/src/ShadUI/Controls/Window/Window.axaml.cs b/src/ShadUI/Controls/Window/Window.axaml.cs
index c148207..9f46740 100644
--- a/src/ShadUI/Controls/Window/Window.axaml.cs
+++ b/src/ShadUI/Controls/Window/Window.axaml.cs
@@ -528,11 +528,22 @@ private void OnWindowStateChanged(WindowState state)
                 ToggleMaxButtonVisibility(false);
                 _lastCornerRadius = RootCornerRadius;
                 RootCornerRadius = new CornerRadius(0);
+                Margin = new Thickness(-1);
                 break;
             case WindowState.Maximized:
+                ToggleMaxButtonVisibility(CanMaximize);
+                RootCornerRadius = _lastCornerRadius;
+                Margin = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+                    ? new Thickness(7)
+                    : new Thickness(0);
+                break;
             case WindowState.Normal:
                 ToggleMaxButtonVisibility(CanMaximize);
                 RootCornerRadius = _lastCornerRadius;
+                Margin = new Thickness(0);
+                break;
+            default:
+                Margin = new Thickness(0);
                 break;
         }
     }