diff --git a/src/optionstr.c b/src/optionstr.c
index 3809b594af..7e2ac65676 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -3418,7 +3418,9 @@ did_set_previewpopup(optset_T *args UNUSED)
     if (parse_previewpopup(NULL) == FAIL)
 	return e_invalid_argument;
 
+# if defined(FEAT_QUICKFIX)
     popup_close_info();
+# endif
     return NULL;
 }
 
diff --git a/src/version.c b/src/version.c
index c78d36663d..2f389a74e1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    58,
 /**/
     57,
 /**/