diff --git a/demos/gtk-demo/listview_settings.c b/demos/gtk-demo/listview_settings.c
index 6a7779ba12b0690777e5c88143d48238a100ee74..c88fbce166110ead323c465be904f70b4e3d1ca4 100644
--- a/demos/gtk-demo/listview_settings.c
+++ b/demos/gtk-demo/listview_settings.c
@@ -30,6 +30,9 @@ item_value_changed (GtkEditableLabel  *label,
   const char *name;
   char *value;
 
+  if (gtk_editable_label_get_editing (label))
+    return;
+
   text = gtk_editable_get_text (GTK_EDITABLE (label));
 
   self = gtk_column_view_cell_get_item (cell);
diff --git a/demos/gtk-demo/listview_settings.ui b/demos/gtk-demo/listview_settings.ui
index bd007a93c7d181b9db8332dee11398c449d397c0..1304edadd8d4f1e3b50a45ff65affbf2198f3c75 100644
--- a/demos/gtk-demo/listview_settings.ui
+++ b/demos/gtk-demo/listview_settings.ui
@@ -126,7 +126,7 @@
             <lookup name="item">GtkColumnViewCell</lookup>
           </lookup>
         </binding>
-        <signal name="notify::label" handler="item_value_changed"/>
+        <signal name="notify::editing" handler="item_value_changed"/>
       </object>
     </property>
   </template>
diff --git a/demos/gtk-demo/listview_settings2.c b/demos/gtk-demo/listview_settings2.c
index 1b4820cf716b85f858da4e861f382f0dd2e2e30d..0a9ff92760cc9e2ca0f0f21dc044a7cbf1724768 100644
--- a/demos/gtk-demo/listview_settings2.c
+++ b/demos/gtk-demo/listview_settings2.c
@@ -14,9 +14,9 @@
 #include "settings-key.h"
 
 static void
-item_value_changed (GtkEditableLabel  *label,
-                    GParamSpec        *pspec,
-                    GtkColumnViewCell *cell)
+item_value_changed (GtkEntry    *entry,
+                    GParamSpec  *pspec,
+                    GtkListItem *item)
 {
   SettingsKey *self;
   GSettingsSchemaKey *key;
@@ -27,9 +27,9 @@ item_value_changed (GtkEditableLabel  *label,
   const char *name;
   char *value;
 
-  text = gtk_editable_get_text (GTK_EDITABLE (label));
+  text = gtk_editable_get_text (GTK_EDITABLE (entry));
 
-  self = gtk_column_view_cell_get_item (cell);
+  self = gtk_list_item_get_item (item);
   key = settings_key_get_key (self);
 
   type = g_settings_schema_key_get_value_type (key);
@@ -54,10 +54,10 @@ item_value_changed (GtkEditableLabel  *label,
   return;
 
 revert:
-  gtk_widget_error_bell (GTK_WIDGET (label));
+  gtk_widget_error_bell (GTK_WIDGET (entry));
 
   g_object_get (self, "value", &value, NULL);
-  gtk_editable_set_text (GTK_EDITABLE (label), value);
+  gtk_editable_set_text (GTK_EDITABLE (entry), value);
   g_free (value);
 }
 
diff --git a/demos/gtk-demo/listview_settings2.ui b/demos/gtk-demo/listview_settings2.ui
index aaba281354feb7cef7d5b4612e34a61296d69138..826644adaff4eb36754258a033b494c3909daed6 100644
--- a/demos/gtk-demo/listview_settings2.ui
+++ b/demos/gtk-demo/listview_settings2.ui
@@ -87,7 +87,7 @@
                 <lookup name="item">GtkListItem</lookup>
               </lookup>
             </binding>
-            <signal name="notify::label" handler="item_value_changed"/>
+            <signal name="notify::text" handler="item_value_changed"/>
           </object>
         </child>
       </object>