diff --git a/modules/common-ui-components-workout-editor/src/main/java/com/ankitsuda/rebound/ui/components/workouteditor/WorkoutExerciseItem.kt b/modules/common-ui-components-workout-editor/src/main/java/com/ankitsuda/rebound/ui/components/workouteditor/WorkoutExerciseItem.kt
index eb836f3e..505ac746 100644
--- a/modules/common-ui-components-workout-editor/src/main/java/com/ankitsuda/rebound/ui/components/workouteditor/WorkoutExerciseItem.kt
+++ b/modules/common-ui-components-workout-editor/src/main/java/com/ankitsuda/rebound/ui/components/workouteditor/WorkoutExerciseItem.kt
@@ -294,9 +294,9 @@ fun LazyListScope.workoutExerciseItemAlt(
     val revisedSetsTexts = getRevisedSetNumbers()
 
     items(items = sortedEntries, key = {
-        "${it.entryId}_${it.rpe}"
+//        "${it.entryId}_${it.rpe}"
 //        "${it.entryId}_${it.setNumber}"
-//        it.entryId
+        it.entryId
     }) { entry ->
         SetItem(
             useReboundKeyboard = useReboundKeyboard,
@@ -339,7 +339,7 @@ fun LazyListScope.workoutExerciseItemAlt(
     }
 }
 
-@OptIn(ExperimentalMaterialApi::class, ExperimentalFoundationApi::class)
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun LazyItemScope.SetItem(
     exercise: Exercise,
@@ -354,6 +354,14 @@ private fun LazyItemScope.SetItem(
         mutableStateOf(exerciseLogEntry)
     }
 
+    LaunchedEffect(key1 = exerciseLogEntry) {
+        // We have to change saved rpe manually because
+        // main rpe change is not handled by SetItem function
+        if (exerciseLogEntry.rpe != mLogEntry.rpe) {
+            mLogEntry = mLogEntry.copy(rpe = exerciseLogEntry.rpe)
+        }
+    }
+
     val completionAnimDuration = 200
     val completionAnimSpecFloat =
         tween<Float>(
diff --git a/modules/common-ui-resources/src/main/res/values/strings.xml b/modules/common-ui-resources/src/main/res/values/strings.xml
index 930ab0ec..3adaa110 100644
--- a/modules/common-ui-resources/src/main/res/values/strings.xml
+++ b/modules/common-ui-resources/src/main/res/values/strings.xml
@@ -223,9 +223,9 @@
     <string name="rpe_8_5_title">Very Hard Effort</string>
     <string name="rpe_8_5_description">Could have maybe done 2 more reps</string>
     <string name="rpe_9_title">Extremely Hard Effort</string>
-    <string name="rpe_9_description">Could have definitely done 1 more reps</string>
+    <string name="rpe_9_description">Could have definitely done 1 more rep</string>
     <string name="rpe_9_5_title">Extremely Hard Effort</string>
-    <string name="rpe_9_5_description">Could have maybe done 1 more reps</string>
+    <string name="rpe_9_5_description">Could have maybe done 1 more rep</string>
     <string name="rpe_10_title">Max Effort</string>
     <string name="rpe_10_description">No more reps possible</string>
 </resources>
\ No newline at end of file