diff --git a/bundles/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java b/bundles/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java
index 532d255c4da..0cce0ad5b65 100644
--- a/bundles/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java
+++ b/bundles/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java
@@ -426,7 +426,11 @@ protected void restoreDialog(IDialogSettings settings) {
 			}
 
 			// Retrieve the last locations where the user searched (works across restarts)
-			filterHistory.addAll(List.of(settings.getArray(FILTER_HISTORY)));
+			String[] array = settings.getArray(FILTER_HISTORY);
+			if (array != null) {
+				filterHistory.addAll(List.of(array));
+			}
+
 			if (!filterHistory.isEmpty()) {
 				String filter = filterHistory.getFirst();