diff --git a/README.org b/README.org
index b15c02c1..efad9d1c 100644
--- a/README.org
+++ b/README.org
@@ -136,6 +136,11 @@ Helm and Ivy are also supported.  Note that the =helm= and =ivy= packages are no
 *Added*
 +  Option =magit-todos-submodule-list= controls whether to-dos in submodules are displayed (default: off).  (Thanks to [[https://github.com/matsievskiysv][Matsievskiy S.V.]])
 
+*Fixed*
+
++  Enforce word boundary after keyword + suffix. (#135)
++  Enforce word boundary instead of whitespace before keywords. (#124)
+
 *Changed*
 +  Option =magit-todos-exclude-globs= now excludes the `.git/` directory by default.  (Thanks to [[https://github.com/Amorymeltzer][Amorymeltzer]].)
 +  Library ~org~ is no longer loaded automatically, but only when needed.  (This can reduce load time, especially if the user's Org configuration is complex.)  ([[https://github.com/alphapapa/magit-todos/issues/120][#120]].  Thanks to [[https://github.com/meedstrom][Martin Edström]] and [[https://github.com/jsigman][Johnny Sigman]] for suggesting.)
diff --git a/magit-todos.el b/magit-todos.el
index 470745c2..46799152 100644
--- a/magit-todos.el
+++ b/magit-todos.el
@@ -1193,11 +1193,10 @@ When SYNC is non-nil, match items are returned."
                                              (1+ space)
                                              (group (1+ not-newline)))
                                         ;; Non-Org
-                                        (seq (or bol (1+ blank))
+                                        (seq (or (seq word word-boundary) (not word) line-start)
                                              (group (or ,@keywords))
                                              (regexp ,magit-todos-keyword-suffix)
-                                             (optional (1+ blank)
-                                                       (group (1+ not-newline)))))))
+                                             (or (seq word-boundary word) (not word) line-end)))))
                 (search-regexp-pcre (rxt-elisp-to-pcre search-regexp-elisp))
                 (results-regexp (or ,results-regexp
                                     (rx-to-string