diff --git a/e2e-tests/cypress/e2e/browse-data.cy.js b/e2e-tests/cypress/e2e/browse-data.cy.js
index 776d25356..fd1a21875 100644
--- a/e2e-tests/cypress/e2e/browse-data.cy.js
+++ b/e2e-tests/cypress/e2e/browse-data.cy.js
@@ -452,6 +452,7 @@ describe('Data browser data', () => {
     cy.testid('ExportDbModelModal_archiveFolder').select('(Create new)');
     cy.testid('InputTextModal_value').clear().type('test-model');
     cy.testid('InputTextModal_ok').click();
+    cy.testid('ModalBase_window').themeshot('export-database-model-window', { padding: 50 });
     cy.testid('ExportDbModelModal_exportButton').click();
     cy.contains('Album').click();
     cy.contains('autoIncrement');
@@ -465,7 +466,7 @@ describe('Data browser data', () => {
     cy.contains('chinook-archive').rightclick();
     cy.contains('Data duplicator').click();
     cy.contains('Dry run').click();
-    cy.testid("DataDuplicatorTab_importIntoDb").click();
+    cy.testid('DataDuplicatorTab_importIntoDb').click();
     cy.contains('Duplicated Album, inserted 347 rows, mapped 0 rows, missing 0 rows, skipped 0 rows');
     cy.themeshot('dataduplicator');
   });
diff --git a/packages/web/src/modals/ModalBase.svelte b/packages/web/src/modals/ModalBase.svelte
index 4730ce26d..1e41bdb74 100644
--- a/packages/web/src/modals/ModalBase.svelte
+++ b/packages/web/src/modals/ModalBase.svelte
@@ -39,7 +39,14 @@
 <!-- The Modal -->
 <div id="myModal" class="bglayer">
   <!-- Modal content -->
-  <div class="window" class:fullScreen class:simple use:clickOutside on:clickOutside={handleClickOutside}>
+  <div
+    class="window"
+    class:fullScreen
+    class:simple
+    use:clickOutside
+    on:clickOutside={handleClickOutside}
+    data-testid="ModalBase_window"
+  >
     {#if $$slots.header}
       <div class="header" class:fullScreen>
         <div><slot name="header" /></div>