diff --git a/src/popupwin.c b/src/popupwin.c
index 0ad24cf..c926536 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -253,6 +253,10 @@
     if (buf == NULL)
 	return;
     ml_open(buf);
+
+    win_init_popup_win(wp, buf);
+
+    set_local_options_default(wp);
     set_string_option_direct_in_buf(buf, (char_u *)"buftype", -1,
 				     (char_u *)"popup", OPT_FREE|OPT_LOCAL, 0);
     set_string_option_direct_in_buf(buf, (char_u *)"bufhidden", -1,
@@ -262,8 +266,6 @@
     buf->b_p_bl = FALSE;    // unlisted buffer
     buf->b_locked = TRUE;
 
-    win_init_popup_win(wp, buf);
-
     nr = (int)dict_get_number(d, (char_u *)"tab");
     if (nr == 0)
     {