diff --git a/syntax/todo.vim b/syntax/todo.vim
index d4b2219..5e19155 100644
--- a/syntax/todo.vim
+++ b/syntax/todo.vim
@@ -37,8 +37,8 @@ syntax  match  TodoPriorityX  '^([xX])\s.\+$'            contains=TodoDate,TodoP
 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    '+\w\+'                    contains=NONE
-syntax  match  TodoContext    '@\w\+'                    contains=NONE
+syntax  match  TodoProject    '+[^[:blank:]]\+'          contains=NONE
+syntax  match  TodoContext    '@[^[:blank:]]\+'          contains=NONE
 
 " Other priority colours might be defined by the user
 highlight  default  link  TodoDone       Comment