diff --git a/ftplugin/todo.vim b/ftplugin/todo.vim
index b274095..099e5a2 100644
--- a/ftplugin/todo.vim
+++ b/ftplugin/todo.vim
@@ -81,18 +81,38 @@ function! TodoTxtRemoveCompleted()
     call s:AppendToFile(l:done_file, l:completed)
 endfunction
 
+function! TodoTxtSortByContext() range
+    execute a:firstline . "," . a:lastline . "sort /\\(^\\| \\)\\zs@[^[:blank:]]\\+/ r"
+endfunction
+
+function! TodoTxtSortByProject() range
+    execute a:firstline . "," . a:lastline . "sort /\\(^\\| \\)\\zs+[^[:blank:]]\\+/ r"
+endfunction
+
 " Mappings {{{1
 " Sort tasks {{{2
 if !hasmapto("<leader>s",'n')
-    nnoremap <script> <silent> <buffer> <leader>s :sort<CR>
+    nnoremap <script> <silent> <buffer> <leader>s :%sort<CR>
+endif
+
+if !hasmapto("<leader>s",'v')
+    vnoremap <script> <silent> <buffer> <leader>s :sort<CR>
 endif
 
 if !hasmapto("<leader>s@",'n')
-    nnoremap <script> <silent> <buffer> <leader>s@ :sort /\(^\\| \)\zs@[^[:blank:]]\+/ r<CR>
+    nnoremap <script> <silent> <buffer> <leader>s@ :%call TodoTxtSortByContext()<CR>
+endif
+
+if !hasmapto("<leader>s@",'v')
+    vnoremap <script> <silent> <buffer> <leader>s@ :call TodoTxtSortByContext()<CR>
 endif
 
 if !hasmapto("<leader>s+",'n')
-    nnoremap <script> <silent> <buffer> <leader>s+ :sort /\(^\\| \)\zs+[^[:blank:]]\+/ r<CR>
+    nnoremap <script> <silent> <buffer> <leader>s+ :%call TodoTxtSortByProject()<CR>
+endif
+
+if !hasmapto("<leader>s+",'v')
+    vnoremap <script> <silent> <buffer> <leader>s+ :call TodoTxtSortByProject()<CR>
 endif
 
 " Increment and Decrement The Priority
diff --git a/test/tc_sort_context.todo.txt b/test/tc_sort_context.todo.txt
index c74e59a..efa58f7 100644
--- a/test/tc_sort_context.todo.txt
+++ b/test/tc_sort_context.todo.txt
@@ -1,3 +1,5 @@
+# lorem_ipsum
 (B) Linear regression Rnet=Qh@Qle. @cons_emp_model
 (B) Review key questions. @benchmarking
 (A) simple model first @cons_emp_model
+# end_lorem_ipsum
diff --git a/test/tc_sort_context.vim b/test/tc_sort_context.vim
index 7a82c4e..9c75989 100644
--- a/test/tc_sort_context.vim
+++ b/test/tc_sort_context.vim
@@ -11,9 +11,7 @@ let s:SORTED_TASKS = [
       \ ]
 
 function! s:tc.test_sort_by_context()
-  execute 'normal ' . s:LEADER . 's@'
-  execute 'normal ggO# lorem_ipsum'
-  execute 'normal Go# end_lorem_ipsum'
+  call self.data.visual_execute('call TodoTxtSortByContext()', 'lorem_ipsum')
   call self.assert_equal(s:SORTED_TASKS, self.data.get('lorem_ipsum'))
 endfunction
 
diff --git a/test/tc_sort_project.todo.txt b/test/tc_sort_project.todo.txt
index fbfc534..d40f0f0 100644
--- a/test/tc_sort_project.todo.txt
+++ b/test/tc_sort_project.todo.txt
@@ -1,3 +1,5 @@
+# lorem_ipsum
 (B) Linear regression Rnet=Qh+Qle. +cons_emp_model
 (B) Review key questions. +benchmarking
 (A) simple model first +cons_emp_model
+# end_lorem_ipsum
diff --git a/test/tc_sort_project.vim b/test/tc_sort_project.vim
index ba71dd3..f3ab854 100644
--- a/test/tc_sort_project.vim
+++ b/test/tc_sort_project.vim
@@ -11,9 +11,7 @@ let s:SORTED_TASKS = [
       \ ]
 
 function! s:tc.test_sort_by_project()
-  execute 'normal ' . s:LEADER . 's+'
-  execute 'normal ggO# lorem_ipsum'
-  execute 'normal Go# end_lorem_ipsum'
+  call self.data.visual_execute('call TodoTxtSortByProject()', 'lorem_ipsum')
   call self.assert_equal(s:SORTED_TASKS, self.data.get('lorem_ipsum'))
 endfunction