diff --git a/ICSharpCode.Decompiler/IL/ControlFlow/LoopDetection.cs b/ICSharpCode.Decompiler/IL/ControlFlow/LoopDetection.cs
index c9df6ef533..e51aa3acb6 100644
--- a/ICSharpCode.Decompiler/IL/ControlFlow/LoopDetection.cs
+++ b/ICSharpCode.Decompiler/IL/ControlFlow/LoopDetection.cs
@@ -98,6 +98,7 @@ public void Run(Block block, BlockTransformContext context)
 				IncludeNestedContainers(loop);
 				// Try to extend the loop to reduce the number of exit points:
 				ExtendLoop(h, loop, out var exitPoint);
+				IncludeUnreachablePredecessors(loop);
 
 				// Sort blocks in the loop in reverse post-order to make the output look a bit nicer.
 				// (if the loop doesn't contain nested loops, this is a topological sort)
@@ -151,7 +152,7 @@ void IncludeBlock(Block block)
 				}
 			}
 		}
-		
+
 		#region ExtendLoop
 		/// <summary>
 		/// Given a natural loop, add additional CFG nodes to the loop in order
@@ -231,7 +232,7 @@ void IncludeBlock(Block block)
 		/// If it is impossible to use a single exit point for the loop, the lowest common ancestor will be the fake "exit node"
 		/// used by the post-dominance analysis. In this case, we fall back to the old heuristic algorithm.
 		/// 
-		/// Precondition: Requires that a node is marked as visited iff it is contained in the loop.
+		/// Requires and maintains the invariant that a node is marked as visited iff it is contained in the loop.
 		/// </remarks>
 		void ExtendLoop(ControlFlowNode loopHead, List<ControlFlowNode> loop, out ControlFlowNode exitPoint, bool isSwitch=false)
 		{
@@ -244,6 +245,7 @@ void ExtendLoop(ControlFlowNode loopHead, List<ControlFlowNode> loop, out Contro
 				var ep = exitPoint;
 				foreach (var node in TreeTraversal.PreOrder(loopHead, n => (n != ep) ? n.DominatorTreeChildren : null)) {
 					if (node != exitPoint && !node.Visited) {
+						node.Visited = true;
 						loop.Add(node);
 					}
 				}
@@ -568,7 +570,31 @@ bool IsExitPoint(ControlFlowNode node)
 			return false;
 		}
 		#endregion
-		
+
+		/// <summary>
+		/// While our normal dominance logic ensures the loop has just a single reachable entry point,
+		/// it's possible that there are unreachable code blocks that have jumps into the loop.
+		/// We'll also include those into the loop.
+		/// 
+		/// Requires and maintains the invariant that a node is marked as visited iff it is contained in the loop.
+		/// </summary>
+		private void IncludeUnreachablePredecessors(List<ControlFlowNode> loop)
+		{
+			for (int i = 1; i < loop.Count; i++) {
+				Debug.Assert(loop[i].Visited);
+				foreach (var pred in loop[i].Predecessors) {
+					if (!pred.Visited) {
+						if (pred.IsReachable) {
+							Debug.Fail("All jumps into the loop body should go through the entry point");
+						} else {
+							pred.Visited = true;
+							loop.Add(pred);
+						}
+					}
+				}
+			}
+		}
+
 		/// <summary>
 		/// Move the blocks associated with the loop into a new block container.
 		/// </summary>
@@ -642,8 +668,12 @@ private void DetectSwitchBody(Block block, SwitchInstruction switchInst)
 				// (unlike loops which should not be nested unless necessary,
 				//  nesting switches makes it clearer in which cases a piece of code is reachable)
 				nodesInSwitch.AddRange(TreeTraversal.PreOrder(exitPoint, p => p.DominatorTreeChildren));
+				foreach (var node in nodesInSwitch) {
+					node.Visited = true;
+				}
 				exitPoint = null;
 			}
+			IncludeUnreachablePredecessors(nodesInSwitch);
 
 			context.Step("Create BlockContainer for switch", switchInst);
 			// Sort blocks in the loop in reverse post-order to make the output look a bit nicer.
diff --git a/ICSharpCode.Decompiler/IL/ControlFlow/SwitchDetection.cs b/ICSharpCode.Decompiler/IL/ControlFlow/SwitchDetection.cs
index 3028313e23..7311d4f6a5 100644
--- a/ICSharpCode.Decompiler/IL/ControlFlow/SwitchDetection.cs
+++ b/ICSharpCode.Decompiler/IL/ControlFlow/SwitchDetection.cs
@@ -22,6 +22,7 @@
 using System.Linq;
 using System.Diagnostics;
 using ICSharpCode.Decompiler.Util;
+using ICSharpCode.Decompiler.TypeSystem;
 
 namespace ICSharpCode.Decompiler.IL.ControlFlow
 {