diff --git a/doc/src/09020-changelog.md b/doc/src/09020-changelog.md
index 3ef4ab64..19d2e9ef 100644
--- a/doc/src/09020-changelog.md
+++ b/doc/src/09020-changelog.md
@@ -75,6 +75,8 @@ This section contains the changelog from the last release to the next release.
     * `imag-diary create --timed` did not work as expected
     * `libimagstore` got another fix with the file parsing, as the
       `std::str::Lines` iterator takes empty lines as no lines.
+    * `libimagentryedit` fixed to inherit stdin and stderr to child process for
+      editor command.
 
 
 ## 0.6.3
diff --git a/lib/core/libimagrt/src/runtime.rs b/lib/core/libimagrt/src/runtime.rs
index 8f18f75a..8bc1cf70 100644
--- a/lib/core/libimagrt/src/runtime.rs
+++ b/lib/core/libimagrt/src/runtime.rs
@@ -458,7 +458,12 @@ impl<'a> Runtime<'a> {
             .value_of("editor")
             .map(String::from)
             .or(env::var("EDITOR").ok())
-            .map(Command::new)
+            .map(|s| {
+                let mut c = Command::new(s);
+                c.stdin(::std::process::Stdio::inherit());
+                c.stderr(::std::process::Stdio::inherit());
+                c
+            })
     }
 
     pub fn stdout(&self) -> OutputProxy {