diff --git a/index.js b/index.js
index b5b755c..c3b7a8f 100644
--- a/index.js
+++ b/index.js
@@ -27,7 +27,8 @@ module.exports.update = function (fromNode, toNode, opts) {
       }
     }
     // copy values for form elements
-    if ((f.nodeName === 'INPUT' && f.type !== 'file') || f.nodeName === 'SELECT') {
+    if (f.nodeName === 'INPUT' && f.type !== 'file') {
+      // Keep value if not set on mutating element
       if (t.getAttribute('value') === null) t.value = f.value
     } else if (f.nodeName === 'TEXTAREA') {
       if (t.getAttribute('value') === null) f.value = t.value
diff --git a/test.js b/test.js
index 8501c1f..e53861a 100644
--- a/test.js
+++ b/test.js
@@ -37,10 +37,29 @@ test('custom event listeners and properties are ignored', function (t) {
   el.click()
 })
 
-test('input values get copied', function (t) {
+test('input value gets copied from mutating element', function (t) {
   t.plan(1)
   var el = yo`<input type="text" />`
-  el.value = 'hi'
+  var newEl = yo`<input type="text" />`
+  newEl.setAttribute('value', 'hi')
+  yo.update(el, newEl)
+  t.equal(el.value, 'hi')
+})
+
+test('input value can be cleared from mutating element', function (t) {
+  t.plan(1)
+  var el = yo`<input type="text" />`
+  el.setAttribute('value', 'hi')
+  var newEl = yo`<input type="text" />`
+  newEl.setAttribute('value', '')
+  yo.update(el, newEl)
+  t.equal(el.value, '')
+})
+
+test('input value is kept if mutating element doesn\'t have one', function (t) {
+  t.plan(1)
+  var el = yo`<input type="text" />`
+  el.setAttribute('value', 'hi')
   var newEl = yo`<input type="text" />`
   yo.update(el, newEl)
   t.equal(el.value, 'hi')
@@ -55,3 +74,12 @@ test('textarea values get copied', function (t) {
   yo.update(el, textarea('bar'))
   t.equal(el.value, 'bar')
 })
+
+test('select element selection state gets copied', function (t) {
+  t.plan(1)
+  var el = yo`<select><option>0</option><option>1</option></select>`
+  var newEl = yo`<select><option>0</option><option selected>1</option></select>`
+
+  yo.update(el, newEl)
+  t.equal(el.selectedIndex, 1)
+})