diff --git a/autoload/fzf/vim.vim b/autoload/fzf/vim.vim
index ff7facf..de0c1b8 100755
--- a/autoload/fzf/vim.vim
+++ b/autoload/fzf/vim.vim
@@ -563,8 +563,9 @@ endfunction
 let s:tag_address_part = '\%(\d\+\|/\%(\\.\|[^/\\]\)*/\|?\%(\\.\|[^?\\]\)*?\)'
 let s:tag_address_open = '\%(/\%(\\.\|[^/\\]\)*\|?\%(\\.\|[^?\\]\)*\)'
 function! s:tag_address(rest, whole)
-  " :BTags aligns its columns, so its field arrives padded
-  let rest = s:strip(a:rest)
+  " :BTags aligns its columns, so its field arrives padded, and a tags file with
+  " CRLF endings leaves a carriage return, which s:strip() keeps
+  let rest = substitute(a:rest, '^[ \t\r]*\|[ \t\r]*$', '', 'g')
   let chain = '^'.s:tag_address_part.'\%(;'.s:tag_address_part.'\)*'
   let address = matchstr(rest, chain.'\ze\%(;"\|$\)')
   if !empty(address)