diff --git a/plugin/fzf.vim b/plugin/fzf.vim
index 89f1b21..8dc5b8a 100644
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@@ -201,7 +201,7 @@ function! s:pushd(dict)
 endfunction
 
 function! s:popd(dict)
-  if has_key(a:dict, 'prev_dir')
+  if has_key(a:dict, 'prev_dir') && getcwd() ==# a:dict.dir
     execute 'chdir '.s:escape(remove(a:dict, 'prev_dir'))
   endif
 endfunction