diff --git a/ChangeLog b/ChangeLog
index b81eaae1..29e02dcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-28  Benno Schulenberg  <bensberg@justemail.net>
+	* src/winio.c (statusbar): Don't bother putting back the cursor in
+	the edit window, as it is off anyway, and will be placed back in the
+	main loop.  This prevents a segfault when trying to open a directory.
+
 2016-03-23  Benno Schulenberg  <bensberg@justemail.net>
 	* src/search.c (findnextstr): Prevent the internal spell checker from
 	finding the first occurrence twice.  And delete the piece of dead code
diff --git a/src/winio.c b/src/winio.c
index 97e45c62..0539628c 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -2147,9 +2147,6 @@ void statusbar(const char *msg, ...)
     wattroff(bottomwin, interface_color_pair[STATUS_BAR].pairnum);
 
     wnoutrefresh(bottomwin);
-   /* Leave the cursor in the edit window, not in the statusbar. */
-    reset_cursor();
-    wnoutrefresh(edit);
 
     disable_cursorpos = TRUE;