diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm
index fab1554bad8..75c8561bacc 100644
--- a/code/modules/surgery/robotics.dm
+++ b/code/modules/surgery/robotics.dm
@@ -216,7 +216,7 @@
 		if(I.damage > 0 && I.robotic >= 2)
 			is_organ_damaged = 1
 			break
-	return affected.open == 3 && is_organ_damaged
+	return is_organ_damaged && affected.open == (BP_IS_ROBOTIC(affected) ? 3 : 2)
 
 /datum/surgery_step/robotics/fix_organ_robotic/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 	if(!ishuman(target))
diff --git a/html/changelogs/repair_augments_in_organic.yml b/html/changelogs/repair_augments_in_organic.yml
new file mode 100644
index 00000000000..4690cae2183
--- /dev/null
+++ b/html/changelogs/repair_augments_in_organic.yml
@@ -0,0 +1,6 @@
+author: mikomyazaki
+
+delete-after: True
+
+changes: 
+  - bugfix: "You can now properly repair augments that are inside organic body parts, similarly to ones inside robotic body parts."