diff --git a/ChangeLog b/ChangeLog
index 7f0f474676738ad0473f66b67b53450c7a7b3502..6d0eba1b7c7a3fee3a5aa07d5debb8ffdfe88eb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,9 @@ General
 	- Fix off by one error that was making ^G help in normal mode and
 	  ^_ in pico mode not be displayed in the help (bug discovered by
 	  Rocco Corsi).
+  do_toggle()
+	- Added fix_editbot() call to fix improper redisplay of edit
+	  window when using nohelp toggle (bug discovered by Rocco Corsi).
 - nano.1, nano.1.html:
 	- Updated man page for -b, -e, -f and expanded explanation for -p.
 - utils.c:
diff --git a/nano.c b/nano.c
index 8033fb65c0ddf1d367f65554b0f848bf6d8e452e..9acc1779adf065e27b6fefc55095dd6a22ca1e14 100644
--- a/nano.c
+++ b/nano.c
@@ -2003,6 +2003,7 @@ void do_toggle(int which)
 	wclear(bottomwin);
 	wrefresh(bottomwin);
 	window_init();
+	fix_editbot();
 	edit_refresh();
 	display_main_list();
 	break;