diff --git a/syntax/todo.vim b/syntax/todo.vim
index 7b0e366..eabcd9f 100644
--- a/syntax/todo.vim
+++ b/syntax/todo.vim
@@ -37,8 +37,8 @@ syntax  match  TodoPriorityX  '^([xX])\s.\+$'             contains=TodoDate,Todo
 syntax  match  TodoPriorityY  '^([yY])\s.\+$'             contains=TodoDate,TodoProject,TodoContext
 syntax  match  TodoPriorityZ  '^([zZ])\s.\+$'             contains=TodoDate,TodoProject,TodoContext
 syntax  match  TodoDate       '\d\{2,4\}-\d\{2\}-\d\{2\}' contains=NONE
-syntax  match  TodoProject    ' +[^[:blank:]]\+'          contains=NONE
-syntax  match  TodoContext    ' @[^[:blank:]]\+'          contains=NONE
+syntax  match  TodoProject    '\(^\|\W\)+[^[:blank:]]\+'  contains=NONE
+syntax  match  TodoContext    '\(^\|\W\)@[^[:blank:]]\+'  contains=NONE
 
 " Other priority colours might be defined by the user
 highlight  default  link  TodoDone       Comment