diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml
index 3ae9bf0be2..0ec808bd96 100644
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -226,6 +226,7 @@
listview_minesweeper.c
listview_settings.c
listview_weather.c
+ listview_words.c
list_store.c
markup.c
modelbutton.c
diff --git a/demos/gtk-demo/listview_words.c b/demos/gtk-demo/listview_words.c
new file mode 100644
index 0000000000..7966d0ceb6
--- /dev/null
+++ b/demos/gtk-demo/listview_words.c
@@ -0,0 +1,112 @@
+/* Lists/Words
+ *
+ * This demo shows filtering a long list - of words.
+ *
+ * You should have the file `/usr/share/dict/words` installed for
+ * this demo to work.
+ */
+
+#include
+
+static GtkWidget *window = NULL;
+
+const char *factory_text =
+"\n"
+"\n"
+" \n"
+" \n"
+" \n"
+" \n"
+" \n"
+"\n";
+
+static void
+update_title_cb (GListModel *model,
+ guint position,
+ guint removed,
+ guint added,
+ GtkWindow *win)
+{
+ char *title;
+
+ title = g_strdup_printf ("%u Words\n", g_list_model_get_n_items (model));
+ gtk_window_set_title (win, title);
+ g_free (title);
+}
+
+GtkWidget *
+do_listview_words (GtkWidget *do_widget)
+{
+ if (window == NULL)
+ {
+ GtkWidget *header, *listview, *sw, *vbox, *search_entry;
+ GtkFilterListModel *filter_model;
+ GtkStringList *stringlist;
+ GtkFilter *filter;
+ char **words;
+ char *usr_dict_words;
+ GtkExpression *expression;
+
+ if (g_file_get_contents ("/usr/share/dict/words", &usr_dict_words, NULL, NULL))
+ {
+ words = g_strsplit (usr_dict_words, "\n", -1);
+ g_free (usr_dict_words);
+ }
+ else
+ {
+ words = g_strsplit ("lorem ipsum dolor sit amet consectetur adipisci elit sed eiusmod tempor incidunt labore et dolore magna aliqua ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat", " ", -1);
+ }
+ stringlist = gtk_string_list_new ((const char **) words);
+ g_strfreev (words);
+
+ filter = gtk_string_filter_new ();
+ expression = gtk_property_expression_new (GTK_TYPE_STRING_OBJECT, NULL, "string");
+ gtk_string_filter_set_expression (GTK_STRING_FILTER (filter), expression);
+ gtk_expression_unref (expression);
+ filter_model = gtk_filter_list_model_new (G_LIST_MODEL (stringlist), filter);
+
+ window = gtk_window_new ();
+ gtk_window_set_title (GTK_WINDOW (window), "Words");
+ header = gtk_header_bar_new ();
+ gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
+ gtk_window_set_titlebar (GTK_WINDOW (window), header);
+
+ gtk_window_set_display (GTK_WINDOW (window),
+ gtk_widget_get_display (do_widget));
+ g_object_add_weak_pointer (G_OBJECT (window), (gpointer*)&window);
+
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_window_set_child (GTK_WINDOW (window), vbox);
+
+ search_entry = gtk_search_entry_new ();
+ g_object_bind_property (search_entry, "text", filter, "search", 0);
+ gtk_box_append (GTK_BOX (vbox), search_entry);
+
+ sw = gtk_scrolled_window_new ();
+ gtk_box_append (GTK_BOX (vbox), sw);
+
+ listview = gtk_list_view_new_with_factory (
+ gtk_builder_list_item_factory_new_from_bytes (NULL,
+ g_bytes_new_static (factory_text, strlen (factory_text))));
+ gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), listview);
+ gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (filter_model));
+
+ g_signal_connect (filter_model, "items-changed", G_CALLBACK (update_title_cb), window);
+ update_title_cb (G_LIST_MODEL (filter_model), 0, 0, 0, GTK_WINDOW (window));
+
+ g_object_unref (filter_model);
+ }
+
+ if (!gtk_widget_get_visible (window))
+ gtk_widget_show (window);
+ else
+ gtk_window_destroy (GTK_WINDOW (window));
+
+ return window;
+}
diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index eb6513591b..0b419edb21 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -49,6 +49,7 @@ demos = files([
'listview_minesweeper.c',
'listview_settings.c',
'listview_weather.c',
+ 'listview_words.c',
'markup.c',
'modelbutton.c',
'overlay.c',