diff --git a/Codist/Controls/ExternalAdornment.cs b/Codist/Controls/ExternalAdornment.cs
index 64ea1823..4bb9d6b4 100644
--- a/Codist/Controls/ExternalAdornment.cs
+++ b/Codist/Controls/ExternalAdornment.cs
@@ -66,8 +66,9 @@ protected override void OnVisualChildrenChanged(DependencyObject visualAdded, De
 				element.MouseEnter -= SuppressQuickInfo;
 				element.MouseLeftButtonDown -= BringToFront;
 			}
-			if (Children.Count == 0) {
+			if (Children.Count == 0 || Children.Count == 1 && Children[0] is null) {
 				_View.Properties.RemoveProperty(nameof(ExternalAdornment));
+				FocusOnTextView();
 			}
 		}