diff --git a/ICSharpCode.Decompiler/IL/Transforms/ILInlining.cs b/ICSharpCode.Decompiler/IL/Transforms/ILInlining.cs
index d5dd01d6e..571434836 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/ILInlining.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/ILInlining.cs
@@ -64,8 +64,9 @@ namespace ICSharpCode.Decompiler.IL.Transforms
 
 		static bool IsCatchWhenBlock(Block block)
 		{
-			return block.Parent is BlockContainer container && container.Parent is TryCatchHandler handler
-				&& handler.Filter == container && block == container.EntryPoint;
+			var container = BlockContainer.FindClosestContainer(block);
+			return container?.Parent is TryCatchHandler handler
+				&& handler.Filter == container;
 		}
 
 		/// <summary>