diff --git a/app.js b/app.js
index ff5e70f..321d068 100644
--- a/app.js
+++ b/app.js
@@ -261,6 +261,8 @@ function renderNewItemComparison() {
   const baseFields = $("#newItemBaseFields");
   const fixed = getFixedReplacementTarget(state.newItem.target);
   if (fixed) {
+    const field = fixed.baseType === "health" ? "baseHealth" : "baseDamage";
+    const value = Number(state.newItem[field] || fixed.baseValue);
     baseFields.innerHTML = `
       <label>Base stat
         <select disabled>
@@ -268,7 +270,7 @@ function renderNewItemComparison() {
         </select>
       </label>
       <label>Value
-        <input type="number" value="${fixed.baseValue}" readonly />
+        <input data-new-item-field="${field}" type="number" min="0" step="1" value="${value}" />
       </label>`;
   } else {
     baseFields.innerHTML = `
@@ -390,12 +392,14 @@ function getReplacementTargetPiece(target, pieceScores) {
 
 function createNewItemCandidate(target) {
   const fixed = getFixedReplacementTarget(target);
+  const fixedBaseDamage = fixed?.baseType === "damage" ? Number(state.newItem.baseDamage || fixed.baseValue) : 0;
+  const fixedBaseHealth = fixed?.baseType === "health" ? Number(state.newItem.baseHealth || fixed.baseValue) : 0;
   return {
     id: "new-item",
     type: target === "mount" ? "mount" : target === "pet" ? "pet" : "item",
     name: "New item",
-    baseDamage: fixed?.baseType === "damage" ? fixed.baseValue : fixed ? 0 : Number(state.newItem.baseDamage || 0),
-    baseHealth: fixed?.baseType === "health" ? fixed.baseValue : fixed ? 0 : Number(state.newItem.baseHealth || 0),
+    baseDamage: fixed ? fixedBaseDamage : Number(state.newItem.baseDamage || 0),
+    baseHealth: fixed ? fixedBaseHealth : Number(state.newItem.baseHealth || 0),
     effects: state.newItem.effects,
   };
 }