diff --git a/nvim/.config/nvim/keymappings.vim b/nvim/.config/nvim/keymappings.vim
index 8229cc9..a940cd8 100644
--- a/nvim/.config/nvim/keymappings.vim
+++ b/nvim/.config/nvim/keymappings.vim
@@ -18,8 +18,8 @@ nnoremap <Leader>ff  :GFiles<CR>
 nnoremap <Leader>fF  :Files<CR>
 nnoremap <Leader>fL  :Lines<CR>
 nnoremap <Leader>fl  :BLines<CR>
-nnoremap <Leader>ft  :BTags<CR>
-nnoremap <Leader>fT  :Tags<CR>
+nnoremap <Leader>ft  :exe ':Tags ' . expand('<cword>')<CR>
+nnoremap <Leader>fT  :Tags<SPACE>
 nnoremap <Leader>fc  :BCommits<CR>
 nnoremap <Leader>fC  :Commits<CR>
 nnoremap <Leader>fh  :History:<CR>
@@ -47,10 +47,18 @@ nnoremap [b :bprevious<CR>
 nnoremap ]b :bnext<CR>
 nnoremap [B :bfirst<CR>
 nnoremap ]B :blast<CR>
-nnoremap [t :tabprevious<CR>
-nnoremap ]t :tabnext<CR>
-nnoremap [T :tabfirst<CR>
-nnoremap ]T :tablast<CR>
+" Tab navigation
+nnoremap <Leader>tp :tabprevious<CR>
+nnoremap <Leader>tn :tabnext<CR>
+nnoremap <Leader>tf :tabfirst<CR>
+nnoremap <Leader>tl :tablast<CR>
+nnoremap <Leader>tN :tabnew<CR>
+" For tags
+nnoremap [t :tprevious<CR>
+nnoremap ]t :tNext<CR>
+nnoremap [T :tfirst<CR>
+nnoremap ]T :tlast<CR>
+nnoremap <Leader>ts :exec("tselect ".expand("<cword>"))<CR>
 " For git
 nnoremap ]c :GitGutterNextHunk<CR>
 nnoremap [c :GitGutterPrevHunk<CR>