diff --git a/dom/html/TextControlState.cpp b/dom/html/TextControlState.cpp
index 8f5e6d0c6186..82adc0efd4d9 100644
--- a/dom/html/TextControlState.cpp
+++ b/dom/html/TextControlState.cpp
@@ -2488,6 +2488,12 @@ void TextControlState::UnbindFromFrame(nsTextControlFrame* aFrame) {
     DebugOnly<bool> ok = SetValue(value, ValueSetterOption::ByInternalAPI);
     // TODO Find something better to do if this fails...
     NS_WARNING_ASSERTION(ok, "SetValue() couldn't allocate memory");
+    // And mark the selection as dirty to make sure the selection will be
+    // restored properly in RestoreSelectionState. See bug 1993351.
+    if (IsSelectionCached()) {
+      SelectionProperties& props = GetSelectionProperties();
+      props.SetIsDirty();
+    }
   }
 }
 
diff --git a/testing/web-platform/tests/html/semantics/forms/the-textarea-element/selection-after-whitespace-change.html b/testing/web-platform/tests/html/semantics/forms/the-textarea-element/selection-after-whitespace-change.html
new file mode 100644
index 000000000000..a1b568b8ae2b
--- /dev/null
+++ b/testing/web-platform/tests/html/semantics/forms/the-textarea-element/selection-after-whitespace-change.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<textarea id="t" style="white-space: nowrap">Hello</textarea>
+<script>
+promise_test(async () => {
+  t.focus();
+  if (navigator.userAgent.includes("Mac")) {
+    // Meta+ArrowLeft
+    await new test_driver.Actions()
+      .keyDown("\uE03D")
+      .keyDown("\uE058")
+      .keyUp("\uE058")
+      .keyUp("\uE03D")
+      .send();
+  } else {
+    // Home
+    await test_driver.send_keys(t, ["\uE011"]);
+  }
+  // And then Delete
+  await test_driver.send_keys(t, ["\uE017"]);
+  t.style.whiteSpace = "pre-line";
+  await new Promise(setTimeout);
+  assert_equals(t.selectionStart, 0, "selectionStart should remain 0");
+  assert_equals(t.selectionEnd, 0, "selectionEnd should remain 0");
+}, "Changing white-space should not change selection");
+</script>
