diff --git a/ChangeLog b/ChangeLog
index 8a032bdfa8125eecd8f30c69784df6a9cff59ff8..e51094250444c656cc455c9da8e5d6a09a5f3336 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2014-06-22  Benno Schulenberg  <bensberg@justemail.net>
 	* src/browser.c (parse_browser_input), src/help.c (parse_help_input):
 	Remove two pointless calls of get_shortcut(), and adjust the comments.
+	* src/nano.c (do_toggle): When toggling softwrap, only the edit window
+	needs to be refreshed, not the entire screen.
 
 2014-06-22  Mark Majeres  <mark@engine12.com>
 	* src/text.c (do_redo): When redoing a line join at the tail
diff --git a/src/nano.c b/src/nano.c
index 0ec51752c184dfbdf0cb08485ac5c3b5f7c6e82d..395e30464b049ef566761bc84f0c83aa0c4b7137 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1453,11 +1453,9 @@ void do_toggle(int flag)
 #endif
 #ifndef DISABLE_COLOR
 	case NO_COLOR_SYNTAX:
-	    edit_refresh();
-	    break;
 #endif
 	case SOFTWRAP:
-	    total_refresh();
+	    edit_refresh();
 	    break;
     }