diff --git a/ftplugin/todo.vim b/ftplugin/todo.vim
index 247ded6..915002c 100644
--- a/ftplugin/todo.vim
+++ b/ftplugin/todo.vim
@@ -73,11 +73,11 @@ if !hasmapto("<leader>s",'n')
 endif
 
 if !hasmapto("<leader>s@",'n')
-    nnoremap <script> <silent> <buffer> <leader>s@ :sort /.\{-}\(^\|\W\)\ze@/ <CR>
+    nnoremap <script> <silent> <buffer> <leader>s@ :sort /\(^\\| \)\zs@[^[:blank:]]\+/ r<CR>
 endif
 
 if !hasmapto("<leader>s+",'n')
-    nnoremap <script> <silent> <buffer> <leader>s+ :sort /.\{-}\(^\|\W\)\ze+/ <CR>
+    nnoremap <script> <silent> <buffer> <leader>s+ :sort /\(^\\| \)\zs+[^[:blank:]]\+/ r<CR>
 endif
 
 " Increment and Decrement The Priority