diff --git a/cypress/integration/ui/issues/issue-407.js b/cypress/integration/ui/issues/issue-407.js
new file mode 100644
index 00000000..f56e9002
--- /dev/null
+++ b/cypress/integration/ui/issues/issue-407.js
@@ -0,0 +1,30 @@
+import {
+  visitAndApproveStorage
+} from '../../../support/ui-test-helper.js';
+
+// See https://github.com/SVG-Edit/svgedit/issues/407
+describe('Fix issue 407: can enter edit on text child', function () {
+  beforeEach(() => {
+    visitAndApproveStorage();
+  });
+
+  it('should set rectangle selection after click', function () {
+    cy.get('#tool_source').click();
+    cy.get('#svg_source_textarea')
+      .type('{selectall}')
+      .type(`<svg width="640" height="480" xmlns="http://www.w3.org/2000/svg">
+      <g class="layer">
+       <title>Layer 1</title>
+       <g>
+        <rect fill="#ffff00" height="70" width="165" x="179.5" y="146.5"/>
+        <text fill="#000000" id="a_text" text-anchor="middle" x="260.5" xml:space="preserve" y="192.5">hello</text>
+       </g>
+      </g>
+     </svg>`, {parseSpecialCharSequences: false});
+    cy.get('#tool_source_save').click();
+    cy.get('#svg_1').click().dblclick();
+    cy.get('#a_text').should('exist');
+    cy.get('#a_text').trigger('mousedown', {which: 1}).trigger('mouseup').dblclick().type('1234');
+    cy.get('#a_text').should('have.text', 'he1234llo');
+  });
+});
diff --git a/cypress/integration/ui/issues/issue-408.js b/cypress/integration/ui/issues/issue-408.js
new file mode 100644
index 00000000..acccc70a
--- /dev/null
+++ b/cypress/integration/ui/issues/issue-408.js
@@ -0,0 +1,29 @@
+import {
+  visitAndApproveStorage
+} from '../../../support/ui-test-helper.js';
+
+// See https://github.com/SVG-Edit/svgedit/issues/408
+describe('Fix issue 408: does not throw when showing/saving svg content', function () {
+  beforeEach(() => {
+    visitAndApproveStorage();
+  });
+
+  it('should set rectangle selection after click', function () {
+    cy.get('#tool_source').click();
+    cy.get('#svg_source_textarea')
+      .type('{selectall}')
+      .type(`<svg width="640" height="480" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+      <g class="layer">
+       <title>Layer 1</title>
+       <g id="svg_6">
+        <rect fill="#FF0000" height="71" stroke="#000000" stroke-width="5" width="94" x="69.5" y="51.5"/>
+        <circle cx="117.5" cy="87.5" fill="#ffff00" r="19.84943" stroke="#000000" />
+       </g>
+      </g>
+     </svg>`, {parseSpecialCharSequences: false});
+    cy.get('#tool_source_save').click();
+    cy.get('#svg_6').click().dblclick(); // change context
+    cy.get('#tool_source').click(); // reopen tool_source
+    cy.get('#tool_source_save').should('exist'); // The save button should be here if it does not throw
+  });
+});