diff --git a/edit/ChangeLog b/edit/ChangeLog
index 149f34b2d..a088c284e 100644
--- a/edit/ChangeLog
+++ b/edit/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-16  Leonard den Ottolander  <leonard den ottolander nl>
+
+	* wordproc.c (next_word_start): A word is preceded by a whitespace -
+	the latest changes missed that fact. Restore the original behaviour.
+
 2006-06-16  Jindrich Novy  <jnovy@redhat.com>
 
 	* wordproc.c (word_start): Add new argument. Pass extra argument
diff --git a/edit/wordproc.c b/edit/wordproc.c
index cf8271d43..fc16136b1 100644
--- a/edit/wordproc.c
+++ b/edit/wordproc.c
@@ -201,15 +201,20 @@ static int
 next_word_start (unsigned char *t, int q, int size)
 {
     int i;
+    int saw_ws = 0;
+
     for (i = q; i < size; i++) {
 	switch (t[i]) {
 	case '\n':
 	    return -1;
 	case '\t':
 	case ' ':
-	    continue;
+	    saw_ws = 1;
+	    break;
 	default:
-	    return i;
+	    if (saw_ws != 0)
+		return i;
+	    break;
 	}
     }
     return -1;