diff --git a/package-lock.json b/package-lock.json
index ccaf96a..ccb9fd3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10953,7 +10953,7 @@
     },
     "node_modules/protobuf-ts": {
       "version": "1.0.0",
-      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#e926a3b73f9b6a1b4f9e6f520628a905f7f0fb25",
+      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#2aa771366c36285eac26e4e0143c1759380e2fc9",
       "dependencies": {
         "protobufjs": "^6.8.8"
       }
diff --git a/src/grain/CustomGrainForm.tsx b/src/grain/CustomGrainForm.tsx
index 72e3b74..7195e07 100644
--- a/src/grain/CustomGrainForm.tsx
+++ b/src/grain/CustomGrainForm.tsx
@@ -16,38 +16,45 @@ export default function CustomGrainForm(props: Props) {
   const {grainSettings, onGrainSettingsChange} = props
   const grainAPI = useGrainAPI()
   const [{as}] = useGlobalState()
-  const [name, setName] = useState("")
-  const [group, setGroup] = useState("")
-  const [equation, setEquation] = useState<pond.MoistureEquation>(pond.MoistureEquation.MOISTURE_EQUATION_NONE)
-  const [constantA, setConstantA] = useState("0")
-  const [constantB, setConstantB] = useState("0")
-  const [constantC, setConstantC] = useState("0")
-  const [kgPerBushel, setKgPerBushel] = useState("0")
-  const [bushelsPerTonne, setBushelsPerTonne] = useState("0")
-  const [newGrainSettings, setNewGrainSettings] = useState(pond.GrainSettings.create())
-  const [grainMap, setGrainMap] = useState<Map<string, pond.GrainObject>>(new Map())
-  const [grainOptions, setGrainOptions] = useState<Option[]>([])
+  const [name, setName] = useState(grainSettings ? grainSettings.name : "")
+  const [group, setGroup] = useState(grainSettings ? grainSettings.group : "")
+  const [equation, setEquation] = useState<pond.MoistureEquation>(grainSettings ? grainSettings.equation : pond.MoistureEquation.MOISTURE_EQUATION_NONE)
+  const [constantA, setConstantA] = useState(grainSettings ? grainSettings.a.toString() : "0")
+  const [constantB, setConstantB] = useState(grainSettings ? grainSettings.b.toString() : "0")
+  const [constantC, setConstantC] = useState(grainSettings ? grainSettings.c.toString() : "0")
+  const [kgPerBushel, setKgPerBushel] = useState(grainSettings ? grainSettings.kgPerBushel.toString() : "0")
+  const [bushelsPerTonne, setBushelsPerTonne] = useState(grainSettings ? grainSettings.bushelsPerTonne.toString() : "0")
+  const [newGrainSettings, setNewGrainSettings] = useState(grainSettings ?? pond.GrainSettings.create())
+  const [grainMap, setGrainMap] = useState<Map<string, pond.GrainObject>>(
+    grainSettings ? 
+      new Map([
+        ["Active", pond.GrainObject.create({key: "Active", name: grainSettings.name, settings: grainSettings})]
+      ])
+    :
+      new Map())
+  const [grainOptions, setGrainOptions] = useState<Option[]>(
+    grainSettings ? 
+      [
+        {
+          label: grainSettings.name, 
+          value: "Active", 
+          group: "Active"
+        }
+      ] 
+    : 
+      []
+    )
   const [isNew, setIsNew] = useState(false)
-  const [selectedOption, setSelectedOption] = useState<Option | null>(null)
-
-  useEffect(()=>{
-    if(grainSettings){
-      setNewGrainSettings(grainSettings)
-      setName(grainSettings.name)
-      setGroup(grainSettings.group)
-      setEquation(grainSettings.equation)
-      setConstantA(grainSettings.a.toString())
-      setConstantB(grainSettings.b.toString())
-      setConstantC(grainSettings.c.toString())
-      setKgPerBushel(grainSettings.kgPerBushel.toString())
-      setBushelsPerTonne(grainSettings.bushelsPerTonne.toString())
-    }
-  },[grainSettings])
+  const [selectedOption, setSelectedOption] = useState<Option | null>(grainSettings ? {
+          label: grainSettings.name, 
+          value: "Active", 
+          group: "Active"
+        } : null)
 
   useEffect(()=>{
     grainAPI.listGrains(0, 0, "asc", "name", undefined, undefined, undefined, as).then(resp => {
-      let options: Option[] = []
-      let map: Map<string, pond.GrainObject> = new Map()
+      let options: Option[] = grainOptions
+      let map: Map<string, pond.GrainObject> = grainMap
       if (resp.data.grains){
         resp.data.grains.forEach(grain => {
           map.set(grain.key, grain)