diff --git a/docs/Changelog.md b/docs/Changelog.md
index 4d6de2f..91f4db7 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -18,6 +18,7 @@
 - The recent list can also be shown in the command palette:
   Alt+r script-message mpv.net show-recent #menu: View > Show Recent
 - The recent context menu removes the folder info in case of very long paths.
+- Leaving fullscreen using keepaspect-window=no restores the correct size.
 - libmpv shinchiro 2021-08-01
 
 
diff --git a/src/WinForms/MainForm.cs b/src/WinForms/MainForm.cs
index e522dab..4829435 100644
--- a/src/WinForms/MainForm.cs
+++ b/src/WinForms/MainForm.cs
@@ -387,7 +387,7 @@ namespace mpvnet
 
             if (Core.WasInitialSizeSet)
             {
-                if (App.StartSize == "always")
+                if (App.StartSize == "always" || !Core.KeepaspectWindow)
                 {
                     width = ClientSize.Width;
                     height = ClientSize.Height;