diff --git a/src/quickfix.c b/src/quickfix.c
index 014b93d..da405ed 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -2605,17 +2605,16 @@
 	/* set curwin/curbuf to buf and save a few things */
 	aucmd_prepbuf(&aco, buf);
 
-	qf_fill_buffer(qi);
-
 	if ((win = qf_find_win(qi)) != NULL)
 	{
 	    curwin_save = curwin;
 	    curwin = win;
 	    qf_set_title_var(qi);
 	    curwin = curwin_save;
-
 	}
 
+	qf_fill_buffer(qi);
+
 	/* restore curwin/curbuf and a few other things */
 	aucmd_restbuf(&aco);