diff --git a/ChangeLog b/ChangeLog
index 5d93b652..ab7677d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
 	* src/prompt.c (do_statusbar_output): Elide a variable.
 	* src/prompt.c (do_statusbar_delete): There is no need for nulling:
 	the charmove() already copies the terminating null byte.
+	* src/text.c (do_justify), src/winio.c (parse_escape_sequence):
+	Show the cursor after a justification and after an unrecognized
+	escape sequence.
 
 2016-02-21  Benno Schulenberg  <bensberg@justemail.net>
 	* src/files.c (input_tab): If the first Tab added the part that all
diff --git a/src/text.c b/src/text.c
index f16996d6..4523b560 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2234,6 +2234,7 @@ void do_justify(bool full_justify)
     do {
 #endif
 	statusbar(_("Can now UnJustify!"));
+	curs_set(1);
 	kbinput = do_input(FALSE);
 #ifndef NANO_TINY
     } while (kbinput == KEY_WINCH);
diff --git a/src/winio.c b/src/winio.c
index ce3c522e..d55fd920 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -1123,6 +1123,7 @@ int parse_escape_sequence(WINDOW *win, int kbinput)
     if (retval == ERR) {
 	if (win == edit) {
 	    statusbar(_("Unknown Command"));
+	    curs_set(1);
 	    beep();
 	}
     }