diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs
index a22279a3deb..431be82e9db 100644
--- a/components/script/dom/htmltextareaelement.rs
+++ b/components/script/dom/htmltextareaelement.rs
@@ -148,7 +148,7 @@ impl<'a> HTMLTextAreaElementMethods for JSRef<'a, HTMLTextAreaElement> {
         // if the element's dirty value flag is false, then the element's
         // raw value must be set to the value of the element's textContent IDL attribute
         if !self.value_changed.get() {
-            self.SetValue(node.GetTextContent().unwrap());
+            self.reset();
         }
     }
 
@@ -159,7 +159,9 @@ impl<'a> HTMLTextAreaElementMethods for JSRef<'a, HTMLTextAreaElement> {
 
     // https://html.spec.whatwg.org/multipage/forms.html#dom-textarea-value
     fn SetValue(self, value: DOMString) {
+        // TODO move the cursor to the end of the field
         self.textinput.borrow_mut().set_content(value);
+        self.value_changed.set(true);
         self.force_relayout();
     }
 }
@@ -255,7 +257,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLTextAreaElement> {
             _ => (),
         }
 
-        if child.is_text() {
+        if child.is_text() && !self.value_changed.get() {
             self.reset();
         }
     }
diff --git a/tests/html/textarea.html b/tests/html/textarea.html
index b499465dff6..21705f1daab 100644
--- a/tests/html/textarea.html
+++ b/tests/html/textarea.html
@@ -1,6 +1,25 @@
 <html>
 <head></head>
 <body>
-<textarea name="textarea">Write something here
+<form>
+<textarea id="textarea">Write something here
 and maybe here</textarea>
+<button id=setcontent type=button>setContent</button>
+<button id=setvalue type=button>setValue</button>
+<input type=reset>
+<script>
+var text_area = document.getElementById("textarea");
+var set_c = document.getElementById("setcontent");
+var value = document.getElementById("setvalue");
+var x = 0;
+
+set_c.addEventListener("click", function () {
+    text_area.textContent = x;
+    x++;
+});
+
+value.addEventListener("click", function () {
+    text_area.value = "new value!";
+});
+</script>
 </body>
