diff --git a/docs/Manual.md b/docs/Manual.md
index 4dd7143..aca83f5 100644
--- a/docs/Manual.md
+++ b/docs/Manual.md
@@ -446,6 +446,10 @@ Can be suppressed via shift key. Default: yes
 If the player is paused and another file is loaded,
 playback automatically resumes.
 
+#### --keep-open-exit
+
+If set to yes and keep-open is set to no, mpv.net exits after the last file ends.
+In mpv the idle property would be used, it's not possible for mpv.net to use the idle property.
 
 ### General
 
diff --git a/src/Misc/CorePlayer.cs b/src/Misc/Player.cs
similarity index 100%
rename from src/Misc/CorePlayer.cs
rename to src/Misc/Player.cs
index aa29f9d..2d170a3 100644
--- a/src/Misc/CorePlayer.cs
+++ b/src/Misc/Player.cs
@@ -116,7 +116,6 @@ namespace mpvnet
             if (Handle == IntPtr.Zero)
                 throw new Exception("error mpv_create");
 
-            SetPropertyLong("wid", handle.ToInt64());
 
             mpv_request_log_messages(Handle, "terminal-default");
 
@@ -130,6 +129,7 @@ namespace mpvnet
             }
             
             SetPropertyInt("osd-duration", 2000);
+            SetPropertyLong("wid", handle.ToInt64());
 
             SetPropertyBool("input-default-bindings", true);
             SetPropertyBool("input-builtin-bindings", false);
diff --git a/src/Resources/editor_conf.txt b/src/Resources/editor_conf.txt
index f283098..2c803e2 100644
--- a/src/Resources/editor_conf.txt
+++ b/src/Resources/editor_conf.txt
@@ -513,7 +513,7 @@ filter = Playback
 help = Using no, mpv would terminate after the last file but mpv.net never terminates automatically.
 
 option = yes     If the current file ends, go to the next file, keep the last file open.
-option = no      If the current file ends, go to the next file.
+option = no      If the current file ends, go to the next file. If keep-open-exit is set to yes, mpv.net exits after the last file.
 option = always  Playback will never automatically advance to the next file.
 
 [setting]
@@ -531,7 +531,7 @@ name = keep-open-exit
 file = mpvnet
 default = no
 filter = Playback
-help = If set to yes and keep-open is set to no, mpv.net exits after the last file ends.
+help = If set to yes and keep-open is set to no, mpv.net exits after the last file ends. In mpv the idle property would be used, it's not possible for mpv.net to use the idle property.
 
 option = yes
 option = no
diff --git a/src/mpv.net.csproj b/src/mpv.net.csproj
index b644d6f..51e92b5 100644
--- a/src/mpv.net.csproj
+++ b/src/mpv.net.csproj
@@ -193,7 +193,7 @@
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Misc\Misc.cs" />
-    <Compile Include="Misc\CorePlayer.cs" />
+    <Compile Include="Misc\Player.cs" />
     <Compile Include="Misc\Commands.cs" />
     <Compile Include="Native\Native.cs" />
     <Compile Include="Misc\Program.cs" />