diff --git a/templates/items/skill.hbs b/templates/items/skill.hbs
index 189ad9df..c45a0c03 100644
--- a/templates/items/skill.hbs
+++ b/templates/items/skill.hbs
@@ -19,8 +19,8 @@
         <label class='item-setting-label'>
             {{localize 'BW.skill.type'}}
         </label>
-        <select name='system.skilltype' value='{{system.skilltype}}'>
-            {{selectOptions skillTypes value=system.skilltype localize=true}}
+        <select name='system.skilltype'>
+            {{selectOptions skillTypes selected=system.skilltype localize=true}}
         </select>
         <label class='item-setting-label'>
             {{localize 'BW.skill.restrictions'}}
diff --git a/templates/parts/npc-stat.hbs b/templates/parts/npc-stat.hbs
index 55fe7afb..af8ed564 100644
--- a/templates/parts/npc-stat.hbs
+++ b/templates/parts/npc-stat.hbs
@@ -5,7 +5,7 @@
             {{#if attributeShadePath}}
             {{log this}}
             <select name="system.{{attributeShadePath}}">
-                {{selectOptions @root.shades selected=(concat "system." attributeShadePath)}}
+                {{selectOptions @root.shades selected=attributeShade}}
             </select>
             {{/if}}
         <input type="number" name="system.{{attributePath}}" data-dtype="Number" value="{{attributeValue}}">