diff --git a/docs/Changelog.md b/docs/Changelog.md
index c629998..46a6084 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -9,6 +9,7 @@
 - Support for --keep-open=no.
 - Profile selection in the context menu.
 - Use defaults in case settings.xml fails loading (not reproducible).
+- conf editor support for keepaspect-window.
 - libmpv shinchiro 2021-07-18
 
 
diff --git a/src/Resources/editor_conf.txt b/src/Resources/editor_conf.txt
index 29a061f..9146f9b 100644
--- a/src/Resources/editor_conf.txt
+++ b/src/Resources/editor_conf.txt
@@ -368,6 +368,16 @@ option = height-session  Height is remembered in the current session
 option = height-always   Height is always remembered
 option = always          Size is always remembered
 
+[setting]
+name = keepaspect-window
+file = mpv
+default = yes
+filter = Screen
+help = keepaspect-window will lock the window size to the video aspect. Default: yes
+
+option = yes
+option = no
+
 [setting]
 name = start-threshold
 file = mpvnet