diff --git a/composeApp/src/desktopMain/kotlin/com/jaytux/grader/ui/Assignments.kt b/composeApp/src/desktopMain/kotlin/com/jaytux/grader/ui/Assignments.kt
index d31498f..413353c 100644
--- a/composeApp/src/desktopMain/kotlin/com/jaytux/grader/ui/Assignments.kt
+++ b/composeApp/src/desktopMain/kotlin/com/jaytux/grader/ui/Assignments.kt
@@ -205,8 +205,8 @@ fun SoloAssignmentView(state: SoloAssignmentState) {
                     ) { state.updateTask(updTask.toMarkdown()) }
                 } else {
                     val (student, fg) = grades[idx - 1]
-                    var sGrade by remember { mutableStateOf(fg?.grade ?: "") }
-                    var sMsg by remember { mutableStateOf(TextFieldValue(fg?.feedback ?: "")) }
+                    var sGrade by remember(idx) { mutableStateOf(fg?.grade ?: "") }
+                    var sMsg by remember(idx) { mutableStateOf(TextFieldValue(fg?.feedback ?: "")) }
                     Row {
                         Text("Grade: ", Modifier.align(Alignment.CenterVertically))
                         OutlinedTextField(sGrade, { sGrade = it }, Modifier.weight(0.2f))
diff --git a/composeApp/src/desktopMain/kotlin/com/jaytux/grader/viewmodel/DbState.kt b/composeApp/src/desktopMain/kotlin/com/jaytux/grader/viewmodel/DbState.kt
index ea04040..e1fb2a6 100644
--- a/composeApp/src/desktopMain/kotlin/com/jaytux/grader/viewmodel/DbState.kt
+++ b/composeApp/src/desktopMain/kotlin/com/jaytux/grader/viewmodel/DbState.kt
@@ -514,7 +514,7 @@ class SoloAssignmentState(val assignment: SoloAssignment) {
                 it[this.grade] = grd
             }
         }
-        feedback.refresh()
+        feedback.refresh(); autofill.refresh()
     }
 
     fun updateTask(t: String) {