diff --git a/source/blender/editors/armature/armature_naming.c b/source/blender/editors/armature/armature_naming.c
index dd9cd0f9d05..0135df646f9 100644
--- a/source/blender/editors/armature/armature_naming.c
+++ b/source/blender/editors/armature/armature_naming.c
@@ -427,6 +427,13 @@ static int armature_flip_names_exec(bContext *C, wmOperator *op)
 			if (EBONE_VISIBLE(arm, ebone)) {
 				if (ebone->flag & BONE_SELECTED) {
 					BLI_addtail(&bones_names, BLI_genericNodeN(ebone->name));
+
+					if (arm->flag & ARM_MIRROR_EDIT) {
+							EditBone *flipbone = ED_armature_ebone_get_mirrored(arm->edbo, ebone);
+							if ((flipbone) && !(flipbone->flag & BONE_SELECTED)) {
+								BLI_addtail(&bones_names, BLI_genericNodeN(flipbone->name));
+							}
+					}
 				}
 			}
 		}