diff --git a/demos/node-editor/meson.build b/demos/node-editor/meson.build
index 7df42e3f6d..7bbd4ce2fe 100644
--- a/demos/node-editor/meson.build
+++ b/demos/node-editor/meson.build
@@ -30,6 +30,9 @@ endforeach
 # desktop file
 install_data('org.gtk.gtk4.NodeEditor.desktop', install_dir: gtk_applicationsdir)
 
+install_data('org.gtk.NodeEditor4.gschema.xml', install_dir: gtk_schemasdir)
+gnome.compile_schemas()
+
 # appdata
 configure_file(
   input: 'org.gtk.gtk4.NodeEditor.appdata.xml.in',
diff --git a/demos/node-editor/node-editor-application.c b/demos/node-editor/node-editor-application.c
index 50e284fe03..babf598ced 100644
--- a/demos/node-editor/node-editor-application.c
+++ b/demos/node-editor/node-editor-application.c
@@ -191,6 +191,16 @@ node_editor_application_startup (GApplication *app)
   const char *quit_accels[2] = { "<Ctrl>Q", NULL };
   const char *open_accels[2] = { "<Ctrl>O", NULL };
   GtkCssProvider *provider;
+  GSettings *settings;
+  gchar *session_id;
+
+  settings = g_settings_new ("org.gtk.NodeEditor4");
+  session_id = g_settings_get_string (settings, "session-id");
+  if (session_id)
+    {
+      gtk_application_set_session_id (GTK_APPLICATION (app), session_id);
+      g_free (session_id);
+    }
 
   G_APPLICATION_CLASS (node_editor_application_parent_class)->startup (app);
 
@@ -207,6 +217,9 @@ node_editor_application_startup (GApplication *app)
   gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                               GTK_STYLE_PROVIDER (provider),
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+  g_settings_set_string (settings, "session-id",
+                         gtk_application_get_current_session_id (GTK_APPLICATION (app)));
 }
 
 static void
diff --git a/demos/node-editor/node-editor-window.ui b/demos/node-editor/node-editor-window.ui
index f1f1b003f8..c6f365b951 100644
--- a/demos/node-editor/node-editor-window.ui
+++ b/demos/node-editor/node-editor-window.ui
@@ -109,6 +109,7 @@
     <property name="default-width">1024</property>
     <property name="default-height">768</property>
     <property name="focus-widget">text_view</property>
+    <property name="session-id">main-window</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
         <child type="start">
diff --git a/demos/node-editor/org.gtk.NodeEditor4.gschema.xml b/demos/node-editor/org.gtk.NodeEditor4.gschema.xml
new file mode 100644
index 0000000000..9bb332b6c1
--- /dev/null
+++ b/demos/node-editor/org.gtk.NodeEditor4.gschema.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<schemalist>
+
+  <schema id='org.gtk.NodeEditor4' path='/org/gtk/NodeEditor4/'>
+    <key name='session-id' type='s'>
+      <default>''</default>
+    </key>
+  </schema>
+
+</schemalist>