diff --git a/resources/report/html/editable-table.html b/resources/report/html/editable-table.html
index 40517fc7..8ed9c27d 100644
--- a/resources/report/html/editable-table.html
+++ b/resources/report/html/editable-table.html
@@ -23,7 +23,7 @@
 <template id="messageRow">
     <tr>
         <td>
-            <loot-dropdown-menu class="type" valueattr="value">
+            <loot-dropdown-menu class="type" value="say">
                 <paper-item value="say" noink>Note</paper-item>
                 <paper-item value="warn" noink>Warning</paper-item>
                 <paper-item value="error" noink>Error</paper-item>
@@ -32,7 +32,7 @@
         <td><loot-validated-input error="A content string is required." class="content" required></loot-validated-input></td>
         <td><paper-input class="condition"></paper-input></td>
         <td>
-            <loot-dropdown-menu class="language" valueattr="value" halign="right">
+            <loot-dropdown-menu class="language" halign="right">
                 <!-- Language <option> elements go here. -->
             </loot-dropdown-menu>
         </td>
@@ -46,7 +46,7 @@
 <template id="tagRow">
     <tr>
         <td>
-            <loot-dropdown-menu class="type" valueattr="value">
+            <loot-dropdown-menu class="type" value="add">
                 <paper-item value="add" noink>Add</paper-item>
                 <paper-item value="remove" noink>Remove</paper-item>
             </loot-dropdown-menu>
@@ -89,7 +89,7 @@
     <tr>
         <td><loot-validated-input error="A name is required." class="name" required></loot-validated-input></td>
         <td>
-            <loot-dropdown-menu class="type" valueattr="value">
+            <loot-dropdown-menu class="type">
                 <!-- Game <option> elements go here. -->
             </loot-dropdown-menu>
         </td>
diff --git a/resources/report/html/loot-plugin-editor.html b/resources/report/html/loot-plugin-editor.html
index c324f85c..19610fbf 100644
--- a/resources/report/html/loot-plugin-editor.html
+++ b/resources/report/html/loot-plugin-editor.html
@@ -364,7 +364,7 @@ loot-editor-close
         onHideEditor: function(evt) {
             /* First validate table inputs. */
             var isValid = true;
-            var inputs = evt.target.parentElement.parentElement.getElementsByTagName('input');
+            var inputs = evt.target.parentElement.parentElement.parentNode.getElementsByTagName('loot-validated-input');
             for (var i = 0; i < inputs.length; ++i) {
                 if (!inputs[i].checkValidity()) {
                     isValid = false;
diff --git a/resources/report/js/init.js b/resources/report/js/init.js
index 3047bb65..d502e948 100644
--- a/resources/report/js/init.js
+++ b/resources/report/js/init.js
@@ -68,6 +68,8 @@ function initVars() {
                 settingsLangSelect.appendChild(settingsItem);
                 messageLangSelect.appendChild(settingsItem.cloneNode(true));
             }
+
+            messageLangSelect.setAttribute('value', messageLangSelect.firstElementChild.getAttribute('value'));
         } catch (e) {
             console.log(e);
             console.log('Response: ' + result);
@@ -120,6 +122,7 @@ function initVars() {
                 item.textContent = loot.gameTypes[j];
                 select.appendChild(item);
             }
+            select.setAttribute('value', select.firstElementChild.getAttribute('value'));
 
             try {
                 loot.installedGames = JSON.parse(results[1]);