diff --git a/client/src/components/instance.constructs.jsx b/client/src/components/instance.constructs.jsx
index 312ce513..7e859efa 100644
--- a/client/src/components/instance.constructs.jsx
+++ b/client/src/components/instance.constructs.jsx
@@ -153,7 +153,7 @@ function Construct(props) {
         }
 
         const equipping = skillList.includes(vbox.bound[itemEquip]) && !skill
-            && !tutorialDisableEquip && !duplicateSkill;
+            && !tutorialDisableEquip && !duplicateSkill && i === construct.skills.length;
         const border = () => {
             if (!skill) return '';
             const borderFn = buttons[removeTier(skill.skill)];
@@ -166,7 +166,7 @@ function Construct(props) {
             <label onDragStart={ev => {
                 ev.dataTransfer.setData('text', '');
                 skillClick(ev);
-            }} key={i} draggable="true" onDragEnd={() => setItemUnequip([])}>
+            }} key={i} draggable={skill} onDragEnd={() => setItemUnequip([])}>
                 <button
                     key={i}
                     disabled={!skill && !equipping}
@@ -184,7 +184,7 @@ function Construct(props) {
         const s = construct.specs[i];
 
         if (!s) {
-            const equipping = specList.includes(vbox.bound[itemEquip]);
+            const equipping = specList.includes(vbox.bound[itemEquip]) && i === construct.specs.length;
             const classes = `${equipping ? 'equipping' : 'gray'} empty`;
             return (
                 <button key={i} class={classes} disabled={!equipping} >