diff --git a/ChangeLog b/ChangeLog
index 6c4ee5f435a7fc4e92c319c647c0f7cfd94e540d..59858872fc71eaa9f64529e7dabfc4c4a5db10c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2016-03-29  Benno Schulenberg  <bensberg@justemail.net>
-	* src/nano.c (main): Place the cursor in the edit window also when
-	--constantshow is in effect.
+	* src/nano.c (main), src/text.c (do_justify, do_verbatim_input),
+	src/winio.c (parse_escape_sequence): Place the cursor in the edit
+	window also when --constantshow is in effect, after a ^J Justify or
+	an invalid escape sequence, and when entering a verbatim keystroke.
+	Leave the cursor off during Unicode input, for extra feedback.
 
 2016-03-28  Benno Schulenberg  <bensberg@justemail.net>
 	* src/winio.c (statusbar): Don't bother putting back the cursor in
diff --git a/src/text.c b/src/text.c
index 07dd685340591ff4389f739a5eb8f55436070be6..be7c47c310f88cedaaf5271e3c1638d41fdeb96c 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2250,6 +2250,7 @@ void do_justify(bool full_justify)
     do {
 #endif
 	statusbar(_("Can now UnJustify!"));
+	reset_cursor();
 	curs_set(1);
 	kbinput = do_input(FALSE);
 #ifndef NANO_TINY
@@ -3414,6 +3415,8 @@ void do_verbatim_input(void)
     /* TRANSLATORS: This is displayed when the next keystroke will be
      * inserted verbatim. */
     statusbar(_("Verbatim Input"));
+    reset_cursor();
+    curs_set(1);
 
     /* Read in all the verbatim characters. */
     kbinput = get_verbatim_kbinput(edit, &kbinput_len);
diff --git a/src/winio.c b/src/winio.c
index 78cccea09904132ef5ce399e492ec303af13ba49..ffe1a05e763a42de6353389baf6081a5f8b253b7 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -1118,6 +1118,7 @@ int parse_escape_sequence(WINDOW *win, int kbinput)
     if (retval == ERR) {
 	if (win == edit) {
 	    statusbar(_("Unknown Command"));
+	    reset_cursor();
 	    curs_set(1);
 	    beep();
 	}