diff --git a/CompletionEngine/Avalonia.Ide.CompletionEngine/Parsing/XmlParser.cs b/CompletionEngine/Avalonia.Ide.CompletionEngine/Parsing/XmlParser.cs
index 4b33b498..002f5428 100644
--- a/CompletionEngine/Avalonia.Ide.CompletionEngine/Parsing/XmlParser.cs
+++ b/CompletionEngine/Avalonia.Ide.CompletionEngine/Parsing/XmlParser.cs
@@ -10,6 +10,7 @@ public class XmlParser
     public enum ParserState
     {
         None,
+        InsideDeclaration,
         InsideComment,
         InsideCdata,
         StartElement,
@@ -76,6 +77,9 @@ public XmlParser(ReadOnlyMemory<char> data, int start = 0)
     private const string CdataStart = "![CDATA[";
     private const string CdataEnd = "]]>";
 
+    private const string DeclarationStart = "?";
+    private const string DeclarationEnd = "?>";
+
     private bool CheckPrev(int caret, string checkFor)
     {
         var startAt = caret - checkFor.Length + 1;
@@ -100,7 +104,6 @@ private bool ParseChar()
         var i = _parserPos++;
         var span = _data.Span;
         var c = span[i];
-        char lastChar;
         if (c == '<' && State == ParserState.None)
         {
             State = ParserState.StartElement;
@@ -110,6 +113,18 @@ private bool ParseChar()
 
             _containingTagStart.Push(i);
         }
+        else if (State == ParserState.StartElement && CheckPrev(i, DeclarationStart))
+        {
+            State = ParserState.InsideDeclaration;
+        }
+        else if (State == ParserState.InsideDeclaration && CheckPrev(i, DeclarationEnd))
+        {
+            State = ParserState.None;
+            if (_containingTagStart.Count > 0)
+            {
+                _containingTagStart.Pop();
+            }
+        }
         else if (State == ParserState.StartElement && CheckPrev(i, CommentStart))
         {
             State = ParserState.InsideComment;
@@ -117,6 +132,10 @@ private bool ParseChar()
         else if (State == ParserState.InsideComment && CheckPrev(i, CommentEnd))
         {
             State = ParserState.None;
+            if (_containingTagStart.Count > 0)
+            {
+                _containingTagStart.Pop();
+            }
         }
         else if (State == ParserState.StartElement && CheckPrev(i, CdataStart))
         {
@@ -125,6 +144,10 @@ private bool ParseChar()
         else if (State == ParserState.InsideCdata && CheckPrev(i, CdataEnd))
         {
             State = ParserState.None;
+            if (_containingTagStart.Count > 0)
+            {
+                _containingTagStart.Pop();
+            }
         }
         else if (State == ParserState.StartElement && char.IsWhiteSpace(c))
         {
@@ -202,7 +225,11 @@ private bool ParseChar()
 
     public string? GetParentTagName(int level)
     {
-        if (NestingLevel - level - 1 < 0)
+        if (State == ParserState.None)
+        {
+            level--;
+        }
+        if (NestingLevel - level < 0)
             return null;
         var start = _containingTagStart.Skip(level).FirstOrDefault();
         var m = Regex.Match(_data.Span.Slice(start).ToString(), @"^<[^\s/>]+");
diff --git a/tests/CompletionEngineTests/CompletionEngineTests.csproj b/tests/CompletionEngineTests/CompletionEngineTests.csproj
index cff15f03..d2383b9f 100644
--- a/tests/CompletionEngineTests/CompletionEngineTests.csproj
+++ b/tests/CompletionEngineTests/CompletionEngineTests.csproj
@@ -8,6 +8,17 @@
         <AssemblyOriginatorKeyFile>..\..\Key.snk</AssemblyOriginatorKeyFile>
     </PropertyGroup>
 
+    <ItemGroup>
+      <None Remove="Parsing\Fragemts\GetParentTagName_Empty.xml" />
+      <None Remove="Parsing\Fragemts\Should_GetParentTagName_At_Level_One_Level.xml" />
+      <None Remove="Parsing\Fragemts\Should_GetParentTagName_At_Level_One_Level_With_CDATA.xml" />
+      <None Remove="Parsing\Fragemts\Should_GetParentTagName_At_Level_One_Level_With_Comment.xml" />
+      <None Remove="Parsing\Fragemts\Should_GetParentTagName_At_Level_Two_Level.xml" />
+      <None Remove="Parsing\Fragemts\Should_GetParentTagName_At_Level_Two_Level_With_CDATA.xml" />
+      <None Remove="Parsing\Fragemts\Should_GetParentTagName_At_Level_Two_Level_With_Comment.xml" />
+      <None Remove="Parsing\Test.xml" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
         <PackageReference Include="xunit" Version="2.4.2" />
@@ -16,6 +27,12 @@
     </ItemGroup>
 
     <ItemGroup>
+      <EmbeddedResource Include="Parsing\Fragemts\Should_GetParentTagName_At_Level_Two_Level.xml" />
+      <EmbeddedResource Include="Parsing\Fragemts\Should_GetParentTagName_At_Level_Two_Level_With_CDATA.xml" />
+      <EmbeddedResource Include="Parsing\Fragemts\Should_GetParentTagName_At_Level_One_Level_With_CDATA.xml" />
+      <EmbeddedResource Include="Parsing\Fragemts\Should_GetParentTagName_At_Level_Two_Level_With_Comment.xml" />
+      <EmbeddedResource Include="Parsing\Fragemts\Should_GetParentTagName_At_Level_One_Level_With_Comment.xml" />
+      <EmbeddedResource Include="Parsing\Fragemts\Should_GetParentTagName_At_Level_One_Level.xml" />
       <EmbeddedResource Include="Test.bmp" />
       <AvaloniaResource Include="Test.bmp" />
       <AvaloniaResource Include="Test.xaml" />
diff --git a/tests/CompletionEngineTests/Manipulator/XmlParserTests.cs b/tests/CompletionEngineTests/Manipulator/XmlParserTests.cs
deleted file mode 100644
index e91503d7..00000000
--- a/tests/CompletionEngineTests/Manipulator/XmlParserTests.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System;
-using Avalonia.Ide.CompletionEngine;
-using Xunit;
-
-namespace CompletionEngineTests.Manipulator
-{
-    /// <summary>
-    /// Tests for XmlParser behavior on which TextManipulator is dependent
-    /// </summary>
-    public class XmlParserTests
-    {
-        [Fact]
-        public void Should_BeInNoneState_When_OnClosingBrace()
-        {
-            var parser = XmlParser.Parse("<Grid>");
-            Assert.Equal(XmlParser.ParserState.None, parser.State);
-        }
-
-        [Fact]
-        public void Should_NotBeInClosingTag_When_StartTag()
-        {
-            var p = XmlParser.Parse("<Grid");
-            Assert.False(p.IsInClosingTag);
-        }
-
-        [Fact]
-        public void Should_BeInClosingTag_When_ParsedSlash()
-        {
-            var p = XmlParser.Parse("<Grid></");
-            Assert.True(p.IsInClosingTag);
-        }
-
-        [Fact]
-        public void Should_BeInClosingTag_When_InsideEndTag()
-        {
-            var p = XmlParser.Parse("<Grid></Grid");
-            Assert.True(p.IsInClosingTag);
-        }
-
-        [Fact]
-        public void Should_MoveBackTo0Nesting_When_ParsedClosedTag()
-        {
-            var p = XmlParser.Parse("<Grid><Foo></Foo></");
-            Assert.Equal(0, p.NestingLevel);
-        }
-
-        [Fact]
-        public void Should_MoveBackTo0Nesting_When_ParsedSelfclosedTag()
-        {
-            var p = XmlParser.Parse("<Grid><Foo/></");
-            Assert.Equal(0, p.NestingLevel);
-        }
-
-        [Fact]
-        public void Should_ReturnCorrectTagName()
-        {
-            var p = XmlParser.Parse("<Grid><Tag Attribute=\"\"/");
-            Assert.Equal("Tag", p.ParseCurrentTagName());
-        }
-
-        [Fact]
-        public void Should_SeekEndTag_In_SimpleCase()
-        {
-            string data = "<Grid></Grid>";
-            int ppos = "<Grid".Length;
-            int seek = "<Grid></".Length;
-
-            var p = XmlParser.Parse(data.AsMemory(), 0, ppos);
-            var result = p.SeekClosingTag();
-
-            Assert.True(result);
-            Assert.Equal(seek, p.ParserPos);
-        }
-
-        [Fact]
-        public void Should_SeekEndTag_In_OverClosedTag()
-        {
-            string data = "<Grid><Foo/></Grid>";
-            int ppos = "<Grid".Length;
-            int seek = "<Grid><Foo/></".Length;
-
-            var p = XmlParser.Parse(data.AsMemory(), 0, ppos);
-            var result = p.SeekClosingTag();
-
-            Assert.True(result);
-            Assert.Equal(seek, p.ParserPos);
-        }
-
-        [Fact]
-        public void Should_Fail_On_InavlidNesting()
-        {
-            string data = "<Grid><Foo></Grid>";
-            int ppos = "<Grid".Length;
-            int seek = data.Length;
-
-            var p = XmlParser.Parse(data.AsMemory(), 0, ppos);
-            var result = p.SeekClosingTag();
-
-            Assert.False(result);
-            Assert.Equal(seek, p.ParserPos);
-        }
-    }
-}
diff --git a/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_One_Level.xml b/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_One_Level.xml
new file mode 100644
index 00000000..c643e259
--- /dev/null
+++ b/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_One_Level.xml
@@ -0,0 +1,13 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="using:ACTest.ViewModels"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:l="using:ACTest"
+        xmlns:v="using:ACTest.Views"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        x:Class="ACTest.Views.MainWindow"
+        Icon="/Assets/avalonia-logo.ico"
+        Title="ACTest">
+
+</Window>
diff --git a/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_One_Level_WithComment.xml b/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_One_Level_WithComment.xml
new file mode 100644
index 00000000..2ec28fb3
--- /dev/null
+++ b/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_One_Level_WithComment.xml
@@ -0,0 +1,14 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="using:ACTest.ViewModels"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:l="using:ACTest"
+        xmlns:v="using:ACTest.Views"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        x:Class="ACTest.Views.MainWindow"
+        Icon="/Assets/avalonia-logo.ico"
+        Title="ACTest">
+  <!--Start Here-->
+  
+</Window>
diff --git a/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_One_Level_With_CDATA.xml b/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_One_Level_With_CDATA.xml
new file mode 100644
index 00000000..a227213c
--- /dev/null
+++ b/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_One_Level_With_CDATA.xml
@@ -0,0 +1,17 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="using:ACTest.ViewModels"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:l="using:ACTest"
+        xmlns:v="using:ACTest.Views"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        x:Class="ACTest.Views.MainWindow"
+        Icon="/Assets/avalonia-logo.ico"
+        Title="ACTest">
+
+  <![CDATA[
+      aaaa
+  ]]>
+  
+</Window>
diff --git a/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_One_Level_With_Comment.xml b/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_One_Level_With_Comment.xml
new file mode 100644
index 00000000..2ec28fb3
--- /dev/null
+++ b/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_One_Level_With_Comment.xml
@@ -0,0 +1,14 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="using:ACTest.ViewModels"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:l="using:ACTest"
+        xmlns:v="using:ACTest.Views"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        x:Class="ACTest.Views.MainWindow"
+        Icon="/Assets/avalonia-logo.ico"
+        Title="ACTest">
+  <!--Start Here-->
+  
+</Window>
diff --git a/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_Two_Level.xml b/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_Two_Level.xml
new file mode 100644
index 00000000..673573cc
--- /dev/null
+++ b/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_Two_Level.xml
@@ -0,0 +1,16 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="using:ACTest.ViewModels"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:l="using:ACTest"
+        xmlns:v="using:ACTest.Views"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        x:Class="ACTest.Views.MainWindow"
+        Icon="/Assets/avalonia-logo.ico"
+        Title="ACTest">
+
+  <Window.Styles>
+    
+  </Window.Styles>
+</Window>
diff --git a/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_Two_Level_With_CDATA.xml b/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_Two_Level_With_CDATA.xml
new file mode 100644
index 00000000..d2f88721
--- /dev/null
+++ b/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_Two_Level_With_CDATA.xml
@@ -0,0 +1,21 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="using:ACTest.ViewModels"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:l="using:ACTest"
+        xmlns:v="using:ACTest.Views"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        x:Class="ACTest.Views.MainWindow"
+        Icon="/Assets/avalonia-logo.ico"
+        Title="ACTest">
+
+  <Window.Styles>
+    <![CDATA[
+      aaaa
+  ]]>
+    <Style/>
+    
+  </Window.Styles>
+  
+</Window>
diff --git a/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_Two_Level_With_Comment.xml b/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_Two_Level_With_Comment.xml
new file mode 100644
index 00000000..45d59fe2
--- /dev/null
+++ b/tests/CompletionEngineTests/Parsing/Fragemts/Should_GetParentTagName_At_Level_Two_Level_With_Comment.xml
@@ -0,0 +1,9 @@
+<Window xmlns="/"
+        >
+  <!--Start Here-->
+  <Window.Styles>
+    <!--Styles-->
+    <Style/>
+    
+  </Window.Styles>
+</Window>
diff --git a/tests/CompletionEngineTests/Parsing/XmlParserTests.cs b/tests/CompletionEngineTests/Parsing/XmlParserTests.cs
new file mode 100644
index 00000000..63be256b
--- /dev/null
+++ b/tests/CompletionEngineTests/Parsing/XmlParserTests.cs
@@ -0,0 +1,143 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using Avalonia.Ide.CompletionEngine;
+using Xunit;
+
+namespace CompletionEngineTests.Parsing;
+
+/// <summary>
+/// Tests for XmlParser behavior on which TextManipulator is dependent
+/// </summary>
+public class XmlParserTests
+{
+    [Fact]
+    public void Should_BeInNoneState_When_OnClosingBrace()
+    {
+        var parser = XmlParser.Parse("<Grid>");
+        Assert.Equal(XmlParser.ParserState.None, parser.State);
+    }
+
+    [Fact]
+    public void Should_NotBeInClosingTag_When_StartTag()
+    {
+        var p = XmlParser.Parse("<Grid");
+        Assert.False(p.IsInClosingTag);
+    }
+
+    [Fact]
+    public void Should_BeInClosingTag_When_ParsedSlash()
+    {
+        var p = XmlParser.Parse("<Grid></");
+        Assert.True(p.IsInClosingTag);
+    }
+
+    [Fact]
+    public void Should_BeInClosingTag_When_InsideEndTag()
+    {
+        var p = XmlParser.Parse("<Grid></Grid");
+        Assert.True(p.IsInClosingTag);
+    }
+
+    [Fact]
+    public void Should_MoveBackTo0Nesting_When_ParsedClosedTag()
+    {
+        var p = XmlParser.Parse("<Grid><Foo></Foo></");
+        Assert.Equal(0, p.NestingLevel);
+    }
+
+    [Fact]
+    public void Should_MoveBackTo0Nesting_When_ParsedSelfclosedTag()
+    {
+        var p = XmlParser.Parse("<Grid><Foo/></");
+        Assert.Equal(0, p.NestingLevel);
+    }
+
+    [Fact]
+    public void Should_MoveBackTo0Nesting_When_ParsedDeclaretionTag()
+    {
+        var p = XmlParser.Parse("<?xml version=\"1.0\" encoding=\"utf-8\" ?>");
+        Assert.Equal(0, p.NestingLevel);
+    }
+
+    [Fact]
+    public void Should_ReturnCorrectTagName()
+    {
+        var p = XmlParser.Parse("<Grid><Tag Attribute=\"\"/");
+        Assert.Equal("Tag", p.ParseCurrentTagName());
+    }
+
+    [Fact]
+    public void Should_SeekEndTag_In_SimpleCase()
+    {
+        string data = "<Grid></Grid>";
+        int ppos = "<Grid".Length;
+        int seek = "<Grid></".Length;
+
+        var p = XmlParser.Parse(data.AsMemory(), 0, ppos);
+        var result = p.SeekClosingTag();
+
+        Assert.True(result);
+        Assert.Equal(seek, p.ParserPos);
+    }
+
+    [Fact]
+    public void Should_SeekEndTag_In_OverClosedTag()
+    {
+        string data = "<Grid><Foo/></Grid>";
+        int ppos = "<Grid".Length;
+        int seek = "<Grid><Foo/></".Length;
+
+        var p = XmlParser.Parse(data.AsMemory(), 0, ppos);
+        var result = p.SeekClosingTag();
+
+        Assert.True(result);
+        Assert.Equal(seek, p.ParserPos);
+    }
+
+    [Fact]
+    public void Should_Fail_On_InavlidNesting()
+    {
+        string data = "<Grid><Foo></Grid>";
+        int ppos = "<Grid".Length;
+        int seek = data.Length;
+
+        var p = XmlParser.Parse(data.AsMemory(), 0, ppos);
+        var result = p.SeekClosingTag();
+
+        Assert.False(result);
+        Assert.Equal(seek, p.ParserPos);
+    }
+
+    [Theory]
+    [InlineData("One_Level", 553, 1, 1, "Window")]
+    [InlineData("One_Level_With_CDATA", 589, 1, 1, "Window")]
+    [InlineData("One_Level_With_Comment", 576, 1, 1, "Window")]
+    [InlineData("Two_Level", 578, 1, 2, "Window.Styles")]
+    [InlineData("Two_Level_With_CDATA", 626, 1, 2, "Window.Styles")]
+    [InlineData("Two_Level_With_Comment", 108, 1, 2, "Window.Styles")]
+    public void Should_GetParentTagName_At_Level(string source, int position, int level, int nestingLevelExpected, string expectedParentTag)
+    {
+        var data = GetData(source);
+
+        var state = XmlParser.Parse(data.AsMemory(), position, 0);
+        Assert.NotNull(state);
+        Assert.Equal(nestingLevelExpected, state.NestingLevel);
+        var parentTag = state.GetParentTagName(level);
+        Assert.Equal(expectedParentTag, parentTag);
+
+    }
+
+    string GetData(string name, [CallerMemberName] string callerMethod = "")
+    {
+        var ass = this.GetType().Assembly;
+        if (ass.GetManifestResourceNames()
+             .FirstOrDefault(n => n.EndsWith($"{callerMethod}_{name}.xml")) is string resName)
+        {
+            using var stream = ass.GetManifestResourceStream(resName);
+            return (new StreamReader(stream)).ReadToEnd();
+        }
+        return default(string);
+    }
+}