diff --git a/src/popupmnu.c b/src/popupmnu.c
index 4d84ba8..467d670 100644
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -638,7 +638,9 @@
 {
     int	    resized = FALSE;
     int	    context = pum_height / 2;
+#ifdef FEAT_QUICKFIX
     int	    prev_selected = pum_selected;
+#endif
 #ifdef FEAT_TEXT_PROP
     int	    has_info = FALSE;
 #endif
@@ -892,7 +894,7 @@
 		    }
 		}
 	    }
-# ifdef FEAT_TEXT_PROP
+# if defined(FEAT_TEXT_PROP) && defined(FEAT_QUICKFIX)
 	    if (WIN_IS_POPUP(curwin))
 		// can't keep focus in a popup window
 		win_enter(firstwin, TRUE);
@@ -900,7 +902,7 @@
 	}
 #endif
     }
-# ifdef FEAT_TEXT_PROP
+# if defined(FEAT_TEXT_PROP) && defined(FEAT_QUICKFIX)
     if (!has_info)
 	// close any popup info window
 	popup_close_preview(TRUE);
@@ -922,7 +924,7 @@
     redraw_all_later(NOT_VALID);
     redraw_tabline = TRUE;
     status_redraw_all();
-#ifdef FEAT_TEXT_PROP
+# if defined(FEAT_TEXT_PROP) && defined(FEAT_QUICKFIX)
     // close any popup info window
     popup_close_preview(TRUE);
 #endif
diff --git a/src/version.c b/src/version.c
index 2b9a0c6..81e0d5a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1896,
+/**/
     1895,
 /**/
     1894,