diff --git a/js/js-resources.gresource.xml b/js/js-resources.gresource.xml
index ba481aafa..c6e479150 100644
--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@@ -36,6 +36,7 @@
     <file>misc/weather.js</file>
 
     <file>perf/basic.js</file>
+    <file>perf/closeWithActiveWindows.js</file>
     <file>perf/core.js</file>
     <file>perf/headlessStart.js</file>
     <file>perf/hwtest.js</file>
diff --git a/js/perf/closeWithActiveWindows.js b/js/perf/closeWithActiveWindows.js
new file mode 100644
index 000000000..699b51a89
--- /dev/null
+++ b/js/perf/closeWithActiveWindows.js
@@ -0,0 +1,29 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported run */
+/* eslint camelcase: ["error", { properties: "never", allow: ["^script_", "^malloc", "^glx", "^clutter"] }] */
+
+const Main = imports.ui.main;
+const Scripting = imports.ui.scripting;
+
+/** Run test. */
+async function run() {
+    /* eslint-disable no-await-in-loop */
+
+    /* Make created windows remain visible during exit. */
+    Scripting.disableHelperAutoExit();
+
+    Main.overview.hide();
+    await Scripting.waitLeisure();
+    await Scripting.sleep(1000);
+
+    await Scripting.createTestWindow({
+        width: 640,
+        height: 480,
+    });
+
+    await Scripting.waitTestWindows();
+    await Scripting.waitLeisure();
+    await Scripting.sleep(1000);
+
+    /* eslint-enable no-await-in-loop */
+}
diff --git a/tests/meson.build b/tests/meson.build
index 088a0ce5d..85339dd14 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -39,6 +39,9 @@ perf_tests = [
   {
     'name': 'basic',
   },
+  {
+    'name': 'closeWithActiveWindows',
+  },
   {
     'name': 'headlessStart',
     'options': ['--hotplug'],