diff --git a/autoload/magit/utils.vim b/autoload/magit/utils.vim
index 0e53233e1ec9d13ed63a80a3bd963b63e4828f80..ba7688898e21b3ef93c89aba15856caa0460206f 100644
--- a/autoload/magit/utils.vim
+++ b/autoload/magit/utils.vim
@@ -192,7 +192,7 @@ endfunction
 " param[in] filename: filename to search
 " return: window id, 0 if not found
 function! magit#utils#search_buffer_in_windows(filename)
-	let cur_win = winnr('$')
+	let cur_win = winnr()
 	let last_win = winnr('#')
 	let files={}
 	windo if ( !empty(@%) ) | let files[@%] = winnr() | endif