diff --git a/ILSpy.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs b/ILSpy.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs
index fe22c32ab..ea9bb77ef 100644
--- a/ILSpy.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs
+++ b/ILSpy.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs
@@ -57,13 +57,15 @@ namespace ILSpy.BamlDecompiler.Rewrite
 			foreach (var annotation in element.Annotations<BamlConnectionId>())
 			{
 				int index;
+				bool found = false;
 				if ((index = fieldAssignments.FindIndex(item => item.key.Contains(annotation.Id))) > -1)
 				{
 					var xName = ctx.GetKnownNamespace("Name", XamlContext.KnownNamespace_Xaml, element);
 					if (element.Attribute("Name") is null && element.Attribute(xName) is null)
 						element.Add(new XAttribute(xName, fieldAssignments[index].value.FieldName));
+					found = true;
 				}
-				else if ((index = eventMappings.FindIndex(item => item.key.Contains(annotation.Id))) > -1)
+				if ((index = eventMappings.FindIndex(item => item.key.Contains(annotation.Id))) > -1)
 				{
 					foreach (var entry in eventMappings[index].value)
 					{
@@ -80,8 +82,9 @@ namespace ILSpy.BamlDecompiler.Rewrite
 							element.Add(new XAttribute(xmlns + entry.EventName, entry.MethodName));
 						}
 					}
+					found = true;
 				}
-				else
+				if (!found)
 				{
 					element.Add(new XComment($"Unknown connection ID: {annotation.Id}"));
 				}
@@ -164,14 +167,11 @@ namespace ILSpy.BamlDecompiler.Rewrite
 					{
 						fieldAssignments.Add((section.Labels, field));
 					}
-					else
+					events.Clear();
+					FindEvents(section.Body, events);
+					if (events.Count > 0)
 					{
-						events.Clear();
-						FindEvents(section.Body, events);
-						if (events.Count > 0)
-						{
-							eventMappings.Add((section.Labels, events.ToArray()));
-						}
+						eventMappings.Add((section.Labels, events.ToArray()));
 					}
 				}
 			}
@@ -194,14 +194,11 @@ namespace ILSpy.BamlDecompiler.Rewrite
 					{
 						fieldAssignments.Add((new LongSet(id), field));
 					}
-					else
+					events.Clear();
+					FindEvents(inst, events);
+					if (events.Count > 0)
 					{
-						events.Clear();
-						FindEvents(inst, events);
-						if (events.Count > 0)
-						{
-							eventMappings.Add((new LongSet(id), events.ToArray()));
-						}
+						eventMappings.Add((new LongSet(id), events.ToArray()));
 					}
 				}
 			}