diff --git a/tests/t1330-ls-highlighting.sh b/tests/t1330-ls-highlighting.sh
index 2cf61a2..aa3db44 100755
--- a/tests/t1330-ls-highlighting.sh
+++ b/tests/t1330-ls-highlighting.sh
@@ -148,4 +148,22 @@ TODO: 4 marked as done.
 TODO: 5 of 5 tasks shown
 EOF
 
+# check highlighting with hidden contexts/projects
+#
+cat > todo.txt <<EOF
+(A) +project at the beginning, with priority
+(B) with priority, ending in a +project
+(C) @context at the beginning, with priority
+(Z) with priority, ending in a @context
+EOF
+test_todo_session 'highlighting with hidden contexts/projects' <<EOF
+>>> todo.sh -+ -@ list
+1 (A) at the beginning, with priority
+2 (B) with priority, ending in a
+3 (C) at the beginning, with priority
+4 (Z) with priority, ending in a
+--
+TODO: 4 of 4 tasks shown
+EOF
+
 test_done
diff --git a/todo.sh b/todo.sh
index e04ed37..f2cbb24 100755
--- a/todo.sh
+++ b/todo.sh
@@ -360,7 +360,7 @@ do
             unset HIDE_CONTEXTS_SUBSTITUTION
         else
             ## One or odd value -- hide context names
-            export HIDE_CONTEXTS_SUBSTITUTION='[[:space:]]@[^[:space:]]\{1,\}'
+            export HIDE_CONTEXTS_SUBSTITUTION='[[:space:]]@[[:graph:]]\{1,\}'
         fi
         ;;
     '+' )
@@ -376,7 +376,7 @@ do
             unset HIDE_PROJECTS_SUBSTITUTION
         else
             ## One or odd value -- hide project names
-            export HIDE_PROJECTS_SUBSTITUTION='[[:space:]][+][^[:space:]]\{1,\}'
+            export HIDE_PROJECTS_SUBSTITUTION='[[:space:]][+][[:graph:]]\{1,\}'
         fi
         ;;
     a )