diff --git a/ChangeLog b/ChangeLog
index 5d73e60d..43c69b62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -250,6 +250,9 @@ CVS code -
 	- If the spell-checker printed any error messages onscreen, call
 	  total_refresh() to make sure they're cleared off. (DLR, found
 	  by CHAO Wei-Lun)
+  find_paragraph()
+	- Reset placewewant as well as current_x to 0, in order to avoid
+	  a potential screen update problem. (DLR)
   do_justify()
 	- Save placewewant, and restore it if we unjustify, in order to
 	  avoid a potential screen update problem. (DLR)
diff --git a/src/nano.c b/src/nano.c
index 0c27f8f1..e3b67101 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -3091,6 +3091,7 @@ bool find_paragraph(size_t *const quote, size_t *const par)
 
     /* Move back to the beginning of the current line. */
     current_x = 0;
+    placewewant = 0;
 
     /* Find the first line of the current or next paragraph.  First, if
      * the current line isn't in a paragraph, move forward to the line