diff --git a/core/autoload/text.el b/core/autoload/text.el
index 73f56d40a..e3113335f 100644
--- a/core/autoload/text.el
+++ b/core/autoload/text.el
@@ -149,8 +149,10 @@ in some cases."
                                     (> (point) bol))
                           (backward-char))
                         (skip-chars-backward " " bol)
-                        (unless (or (eq (char-after) 32) (eolp))
-                          (forward-char))
+                        (or (eq (char-after) 32)
+                            (eolp)
+                            (bolp)
+                            (forward-char))
                         (point)))
                     eol)))
       (list bol bot eot eol))))