diff --git a/Directory.Packages.props b/Directory.Packages.props
index 511ec4d415..779a90a181 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -47,6 +47,7 @@
     <PackageVersion Include="ReportGenerator" Version="5.5.9" />
     <PackageVersion Include="coverlet.collector" Version="10.0.0" />
     <PackageVersion Include="GitVersion.MsBuild" Version="6.7.0" />
+    <PackageVersion Include="Terminal.Gui.Editor" Version="2.1.1-develop.75" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <PackageVersion Include="Terminal.Gui" Version="2.0.0" />
diff --git a/Examples/UICatalog/Scenarios/Notepad.cs b/Examples/UICatalog/Scenarios/Notepad.cs
index 988e4764d5..94eaa57c64 100644
--- a/Examples/UICatalog/Scenarios/Notepad.cs
+++ b/Examples/UICatalog/Scenarios/Notepad.cs
@@ -7,7 +7,7 @@ namespace UICatalog.Scenarios;
 [ScenarioMetadata ("Notepad", "Multi-tab text editor using the Tabs control.")]
 [ScenarioCategory ("Controls")]
 [ScenarioCategory ("Tabs")]
-[ScenarioCategory ("TextView")]
+[ScenarioCategory ("TextViewEditor")]
 public class Notepad : Scenario
 {
     private IApplication? _app;
@@ -271,8 +271,8 @@ private void Open (FileInfo? fileInfo, string tabName)
         }
 
         OpenedFile tab = new (this) { Title = tabName, File = fileInfo };
-        tab.CreateAndAddTextView (fileInfo);
-        tab.RegisterTextViewEvents ();
+        tab.CreateAndAddEditor (fileInfo);
+        tab.RegisterEditorEvents ();
 
         _focusedTabs.Add (tab);
         _focusedTabs.Value = tab;
@@ -344,7 +344,7 @@ private int GetSelectedTextLength ()
     {
         if (_focusedTabs?.Value is OpenedFile tab)
         {
-            return tab.TextView?.Text.Length ?? 0;
+            return tab.Editor?.Text.Length ?? 0;
         }
 
         return 0;
@@ -360,7 +360,7 @@ private void Tabs_ValueChanged (object? sender, ValueChangedEventArgs<View?> e)
 
         if (e.NewValue is OpenedFile tab)
         {
-            len = tab.TextView?.Text.Length ?? 0;
+            len = tab.Editor?.Text.Length ?? 0;
         }
 
         LenShortcut.Title = $"Len:{len}";
@@ -376,16 +376,16 @@ private class OpenedFile (Notepad notepad) : View
         public FileInfo? File { get; set; }
 
         /// <summary>Gets whether this tab is a pristine new document — never opened to a file and has no content.</summary>
-        public bool IsPristine => File is null && string.IsNullOrEmpty (TextView?.Text);
+        public bool IsPristine => File is null && string.IsNullOrEmpty (Editor?.Text);
 
-        public TextView? TextView { get; private set; }
+        public TextViewEditor? Editor { get; private set; }
 
         /// <summary>The text of the tab the last time it was saved.</summary>
         private string? _savedText;
 
-        public bool UnsavedChanges => TextView is { } && !string.Equals (_savedText, TextView.Text);
+        public bool UnsavedChanges => Editor is { } && !string.Equals (_savedText, Editor.Text);
 
-        public void CreateAndAddTextView (FileInfo? file)
+        public void CreateAndAddEditor (FileInfo? file)
         {
             var initialText = string.Empty;
 
@@ -394,25 +394,24 @@ public void CreateAndAddTextView (FileInfo? file)
                 initialText = System.IO.File.ReadAllText (file.FullName);
             }
 
-            TextView = new TextView
+            Editor = new TextViewEditor
             {
                 X = 0,
                 Y = 0,
                 Width = Dim.Fill (),
                 Height = Dim.Fill (),
-                Text = initialText,
-                TabKeyAddsTab = false
+                Text = initialText
             };
 
             _savedText = initialText;
 
-            Add (TextView);
+            Add (Editor);
         }
 
         /// <summary>Loads a file into an existing tab, replacing its content.</summary>
         public void LoadFile (FileInfo file)
         {
-            if (TextView is null)
+            if (Editor is null)
             {
                 return;
             }
@@ -426,49 +425,49 @@ public void LoadFile (FileInfo file)
 
             // Set _savedText first so the ContentsChanged handler sees matching text (not dirty).
             _savedText = text;
-            TextView.Text = text;
+            Editor.Text = text;
         }
 
-        public void RegisterTextViewEvents ()
+        public void RegisterEditorEvents ()
         {
-            if (TextView is null)
+            if (Editor is null)
             {
                 return;
             }
 
             // when user makes changes rename tab to indicate unsaved
-            TextView.ContentsChanged += (_, _) =>
-                                        {
-                                            // if current text doesn't match saved text
-                                            bool areDiff = UnsavedChanges;
-
-                                            if (areDiff)
-                                            {
-                                                if (!Title.EndsWith ('*'))
-                                                {
-                                                    Title = Title + "*";
-                                                }
-                                            }
-                                            else
-                                            {
-                                                if (Title.EndsWith ('*'))
-                                                {
-                                                    Title = Title.TrimEnd ('*');
-                                                }
-                                            }
-
-                                            notepad.LenShortcut?.Title = $"Len:{TextView.Text.Length}";
-                                        };
+            Editor.ContentsChanged += (_, _) =>
+                                       {
+                                           // if current text doesn't match saved text
+                                           bool areDiff = UnsavedChanges;
+
+                                           if (areDiff)
+                                           {
+                                               if (!Title.EndsWith ('*'))
+                                               {
+                                                   Title = Title + "*";
+                                               }
+                                           }
+                                           else
+                                           {
+                                               if (Title.EndsWith ('*'))
+                                               {
+                                                   Title = Title.TrimEnd ('*');
+                                               }
+                                           }
+
+                                           notepad.LenShortcut?.Title = $"Len:{Editor.Text.Length}";
+                                       };
         }
 
         internal void Save ()
         {
-            if (TextView is null || File is null || string.IsNullOrWhiteSpace (File.FullName))
+            if (Editor is null || File is null || string.IsNullOrWhiteSpace (File.FullName))
             {
                 return;
             }
 
-            string newText = TextView.Text;
+            string newText = Editor.Text;
 
             System.IO.File.WriteAllText (File.FullName, newText);
             _savedText = newText;
diff --git a/Examples/UICatalog/UICatalog.csproj b/Examples/UICatalog/UICatalog.csproj
index 1dc8d9f303..1de677e941 100644
--- a/Examples/UICatalog/UICatalog.csproj
+++ b/Examples/UICatalog/UICatalog.csproj
@@ -35,6 +35,7 @@
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />
+        <ProjectReference Include="..\..\Terminal.Gui.TextViewEditor\Terminal.Gui.TextViewEditor.csproj" />
     </ItemGroup>
     <ItemGroup>
         <Using Include="System.Drawing.Rectangle" Alias="Rectangle" />
diff --git a/Terminal.Gui.TextViewEditor/Terminal.Gui.TextViewEditor.csproj b/Terminal.Gui.TextViewEditor/Terminal.Gui.TextViewEditor.csproj
new file mode 100644
index 0000000000..05e0715849
--- /dev/null
+++ b/Terminal.Gui.TextViewEditor/Terminal.Gui.TextViewEditor.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <AssemblyName>Terminal.Gui.TextViewEditor</AssemblyName>
+        <TargetFramework>net10.0</TargetFramework>
+        <LangVersion>14</LangVersion>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <RootNamespace>Terminal.Gui.Views</RootNamespace>
+        <PackageId>Terminal.Gui.TextViewEditor</PackageId>
+        <Description>Wraps the Terminal.Gui.Editor view with a TextView-compatible API to ease porting.</Description>
+        <IsPackable>true</IsPackable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
+        <PackageReference Include="Terminal.Gui.Editor" />
+    </ItemGroup>
+</Project>
diff --git a/Terminal.Gui.TextViewEditor/TextViewEditor.cs b/Terminal.Gui.TextViewEditor/TextViewEditor.cs
new file mode 100644
index 0000000000..b8e3337bcd
--- /dev/null
+++ b/Terminal.Gui.TextViewEditor/TextViewEditor.cs
@@ -0,0 +1,264 @@
+using System.Drawing;
+using Terminal.Gui.Document;
+using Terminal.Gui.ViewBase;
+
+namespace Terminal.Gui.Views;
+
+/// <summary>
+///     A <see cref="View"/> that wraps the <c>Terminal.Gui.Editor</c> package's
+///     <see cref="Terminal.Gui.Editor.Editor"/> view with an API that is compatible with
+///     <see cref="TextView"/>, easing migration from <see cref="TextView"/> to the
+///     <c>gui-cs/Editor</c> package.
+/// </summary>
+/// <remarks>
+///     <para>
+///         <see cref="TextViewEditor"/> delegates all text editing to the underlying
+///         <see cref="Terminal.Gui.Editor.Editor"/> while exposing properties and methods that match
+///         the <see cref="TextView"/> API. This enables existing code that uses <see cref="TextView"/>
+///         to migrate incrementally by swapping the type to <see cref="TextViewEditor"/> with
+///         minimal source changes.
+///     </para>
+///     <para>
+///         Not all <see cref="TextView"/> features are supported. Unsupported features will
+///         throw <see cref="NotSupportedException"/> or no-op as documented on each member.
+///     </para>
+/// </remarks>
+public class TextViewEditor : View
+{
+    // Initialized to null! because the base View constructor calls the virtual Text setter
+    // (via SetupText) before this constructor body runs. The null guard in Text protects against this.
+    private readonly Terminal.Gui.Editor.Editor _editor = null!;
+
+    /// <summary>
+    ///     Initializes a new instance of <see cref="TextViewEditor"/>.
+    /// </summary>
+    public TextViewEditor ()
+    {
+        CanFocus = true;
+
+        _editor = new Terminal.Gui.Editor.Editor
+        {
+            X = 0,
+            Y = 0,
+            Width = Dim.Fill (),
+            Height = Dim.Fill ()
+        };
+
+        _editor.CaretChanged += (_, _) => CaretChanged?.Invoke (this, EventArgs.Empty);
+        _editor.SelectionChanged += (_, _) => SelectionChanged?.Invoke (this, EventArgs.Empty);
+
+        // Subscribe to document text changes
+        _editor.Document.Changed += (_, _) => OnContentsChanged ();
+
+        Add (_editor);
+    }
+
+    /// <summary>
+    ///     Gets or sets the text content. This is the primary <see cref="TextView"/>-compatible
+    ///     text property.
+    /// </summary>
+    /// <remarks>
+    ///     Setting this property replaces the entire document content and resets the cursor
+    ///     position to the beginning.
+    /// </remarks>
+    public override string Text
+    {
+        get => _editor?.Document.Text ?? string.Empty;
+        set
+        {
+            if (_editor is null)
+            {
+                return;
+            }
+
+            _editor.Document.Text = value ?? string.Empty;
+            _editor.CaretOffset = 0;
+            OnTextChanged ();
+        }
+    }
+
+    /// <summary>
+    ///     Gets the cursor column (zero-based offset within the current line).
+    /// </summary>
+    public int CurrentColumn
+    {
+        get
+        {
+            DocumentLine line = _editor.Document.GetLineByOffset (_editor.CaretOffset);
+
+            return _editor.CaretOffset - line.Offset;
+        }
+    }
+
+    /// <summary>
+    ///     Gets the current cursor row (zero-based line number).
+    /// </summary>
+    public int CurrentRow
+    {
+        get
+        {
+            DocumentLine line = _editor.Document.GetLineByOffset (_editor.CaretOffset);
+
+            return line.LineNumber - 1; // DocumentLine uses 1-based line numbers
+        }
+    }
+
+    /// <summary>
+    ///     Gets or sets the cursor position as a <see cref="Point"/> where
+    ///     <c>X</c> is the column and <c>Y</c> is the row.
+    /// </summary>
+    public Point InsertionPoint
+    {
+        get => new (CurrentColumn, CurrentRow);
+        set
+        {
+            int row = Math.Max (0, Math.Min (value.Y, _editor.Document.LineCount - 1));
+            DocumentLine line = _editor.Document.GetLineByNumber (row + 1);
+            int col = Math.Max (0, Math.Min (value.X, line.Length));
+            _editor.CaretOffset = line.Offset + col;
+        }
+    }
+
+    /// <summary>
+    ///     Gets the number of lines in the document.
+    /// </summary>
+    public int Lines => _editor.Document.LineCount;
+
+    /// <summary>
+    ///     Gets or sets whether the editor is in read-only mode.
+    /// </summary>
+    public bool ReadOnly
+    {
+        get => _editor.ReadOnly;
+        set => _editor.ReadOnly = value;
+    }
+
+    /// <summary>
+    ///     Gets or sets the tab width (indentation size). Equivalent to <see cref="TextView.TabWidth"/>.
+    /// </summary>
+    public int TabWidth
+    {
+        get => _editor.IndentationSize;
+        set => _editor.IndentationSize = Math.Max (value, 1);
+    }
+
+    /// <summary>
+    ///     Gets the selected text, or <see cref="string.Empty"/> if no selection exists.
+    /// </summary>
+    public string SelectedText
+    {
+        get
+        {
+            if (!_editor.HasSelection)
+            {
+                return string.Empty;
+            }
+
+            return _editor.SelectedText ?? string.Empty;
+        }
+    }
+
+    /// <summary>
+    ///     Gets whether the user currently has text selected.
+    /// </summary>
+    public bool IsSelecting => _editor.HasSelection;
+
+    /// <summary>
+    ///     Gets the length of the current selection.
+    /// </summary>
+    public int SelectedLength => _editor.SelectionLength;
+
+    /// <summary>
+    ///     Gets whether the text has been modified since last load or clear.
+    /// </summary>
+    public bool IsDirty => _editor.Document.UndoStack.CanUndo;
+
+    /// <summary>
+    ///     Raised when the caret (cursor) position changes.
+    /// </summary>
+    public event EventHandler? CaretChanged;
+
+    /// <summary>
+    ///     Raised when the selection changes.
+    /// </summary>
+    public event EventHandler? SelectionChanged;
+
+    /// <summary>
+    ///     Raised when the contents of the editor are changed.
+    /// </summary>
+    public event EventHandler? ContentsChanged;
+
+    /// <summary>
+    ///     Loads text from a file path.
+    /// </summary>
+    /// <param name="path">The file path to load.</param>
+    /// <returns><see langword="true"/> if the file was loaded successfully.</returns>
+    public bool Load (string path)
+    {
+        if (!File.Exists (path))
+        {
+            return false;
+        }
+
+        string content = File.ReadAllText (path);
+        _editor.Document.Text = content;
+        _editor.CaretOffset = 0;
+        _editor.Document.UndoStack.MarkAsOriginalFile ();
+        OnTextChanged ();
+
+        return true;
+    }
+
+    /// <summary>
+    ///     Loads text from a stream.
+    /// </summary>
+    /// <param name="stream">The stream to load from.</param>
+    public void Load (Stream stream)
+    {
+        using StreamReader reader = new (stream);
+        string content = reader.ReadToEnd ();
+        _editor.Document.Text = content;
+        _editor.CaretOffset = 0;
+        _editor.Document.UndoStack.MarkAsOriginalFile ();
+        OnTextChanged ();
+    }
+
+    /// <summary>
+    ///     Selects all text in the editor.
+    /// </summary>
+    public void SelectAll ()
+    {
+        _editor.SelectAll ();
+    }
+
+    /// <summary>
+    ///     Clears the current selection.
+    /// </summary>
+    public void ClearSelection ()
+    {
+        _editor.ClearSelection ();
+    }
+
+    /// <summary>
+    ///     Gets the underlying <see cref="Terminal.Gui.Editor.Editor"/> instance for advanced usage.
+    /// </summary>
+    /// <remarks>
+    ///     Use this property to access Editor-specific features not exposed by the
+    ///     <see cref="TextView"/>-compatible API, such as folding, syntax highlighting,
+    ///     multi-caret editing, and the rendering pipeline.
+    /// </remarks>
+    public Terminal.Gui.Editor.Editor UnderlyingEditor => _editor;
+
+    /// <summary>
+    ///     Gets the underlying <see cref="TextDocument"/> for direct document manipulation.
+    /// </summary>
+    public TextDocument Document => _editor.Document;
+
+    /// <summary>
+    ///     Raises the <see cref="ContentsChanged"/> event.
+    /// </summary>
+    protected virtual void OnContentsChanged ()
+    {
+        ContentsChanged?.Invoke (this, EventArgs.Empty);
+    }
+}
diff --git a/Terminal.sln b/Terminal.sln
index de4c68a853..95765706a6 100644
--- a/Terminal.sln
+++ b/Terminal.sln
@@ -158,6 +158,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Terminal.Gui.Analyzers.Inte
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PerformanceTests", "Tests\PerformanceTests\PerformanceTests.csproj", "{6E98BACA-E6B6-47A0-B45C-B624F8E74EC2}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Terminal.Gui.TextViewEditor", "Terminal.Gui.TextViewEditor\Terminal.Gui.TextViewEditor.csproj", "{048A9D63-B901-404A-8BF0-57DC66E9100F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextViewEditorTests", "Tests\TextViewEditorTests\TextViewEditorTests.csproj", "{9C89E569-2AB8-4970-9D68-793709940604}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -468,6 +472,30 @@ Global
 		{6E98BACA-E6B6-47A0-B45C-B624F8E74EC2}.Release|x64.Build.0 = Release|Any CPU
 		{6E98BACA-E6B6-47A0-B45C-B624F8E74EC2}.Release|x86.ActiveCfg = Release|Any CPU
 		{6E98BACA-E6B6-47A0-B45C-B624F8E74EC2}.Release|x86.Build.0 = Release|Any CPU
+		{048A9D63-B901-404A-8BF0-57DC66E9100F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{048A9D63-B901-404A-8BF0-57DC66E9100F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{048A9D63-B901-404A-8BF0-57DC66E9100F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{048A9D63-B901-404A-8BF0-57DC66E9100F}.Debug|x64.Build.0 = Debug|Any CPU
+		{048A9D63-B901-404A-8BF0-57DC66E9100F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{048A9D63-B901-404A-8BF0-57DC66E9100F}.Debug|x86.Build.0 = Debug|Any CPU
+		{048A9D63-B901-404A-8BF0-57DC66E9100F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{048A9D63-B901-404A-8BF0-57DC66E9100F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{048A9D63-B901-404A-8BF0-57DC66E9100F}.Release|x64.ActiveCfg = Release|Any CPU
+		{048A9D63-B901-404A-8BF0-57DC66E9100F}.Release|x64.Build.0 = Release|Any CPU
+		{048A9D63-B901-404A-8BF0-57DC66E9100F}.Release|x86.ActiveCfg = Release|Any CPU
+		{048A9D63-B901-404A-8BF0-57DC66E9100F}.Release|x86.Build.0 = Release|Any CPU
+		{9C89E569-2AB8-4970-9D68-793709940604}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C89E569-2AB8-4970-9D68-793709940604}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C89E569-2AB8-4970-9D68-793709940604}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9C89E569-2AB8-4970-9D68-793709940604}.Debug|x64.Build.0 = Debug|Any CPU
+		{9C89E569-2AB8-4970-9D68-793709940604}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9C89E569-2AB8-4970-9D68-793709940604}.Debug|x86.Build.0 = Debug|Any CPU
+		{9C89E569-2AB8-4970-9D68-793709940604}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C89E569-2AB8-4970-9D68-793709940604}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C89E569-2AB8-4970-9D68-793709940604}.Release|x64.ActiveCfg = Release|Any CPU
+		{9C89E569-2AB8-4970-9D68-793709940604}.Release|x64.Build.0 = Release|Any CPU
+		{9C89E569-2AB8-4970-9D68-793709940604}.Release|x86.ActiveCfg = Release|Any CPU
+		{9C89E569-2AB8-4970-9D68-793709940604}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -499,6 +527,7 @@ Global
 		{70802F77-F259-44C6-9522-46FCE2FD754E} = {3DD033C0-E023-47BF-A808-9CCE30873C3E}
 		{3116547F-A8F2-4189-BC22-0B47C757164C} = {3DD033C0-E023-47BF-A808-9CCE30873C3E}
 		{6E98BACA-E6B6-47A0-B45C-B624F8E74EC2} = {A589126F-C71A-4FEE-B7EA-2DCA1ADF6A46}
+		{9C89E569-2AB8-4970-9D68-793709940604} = {A589126F-C71A-4FEE-B7EA-2DCA1ADF6A46}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9F8F8A4D-7B8D-4C2A-AC5E-CD7117F74C03}
diff --git a/Tests/TextViewEditorTests/TextViewEditorBasicTests.cs b/Tests/TextViewEditorTests/TextViewEditorBasicTests.cs
new file mode 100644
index 0000000000..cbeae9dd06
--- /dev/null
+++ b/Tests/TextViewEditorTests/TextViewEditorBasicTests.cs
@@ -0,0 +1,237 @@
+// Copilot
+
+using Terminal.Gui.Views;
+
+namespace TextViewEditorTests;
+
+/// <summary>
+///     Unit tests for <see cref="TextViewEditor"/>.
+/// </summary>
+public class TextViewEditorBasicTests
+{
+    [Fact]
+    public void Constructor_Creates_Instance ()
+    {
+        TextViewEditor editor = new ();
+
+        Assert.NotNull (editor);
+        Assert.NotNull (editor.UnderlyingEditor);
+        Assert.NotNull (editor.Document);
+    }
+
+    [Fact]
+    public void Text_SetAndGet_RoundTrips ()
+    {
+        TextViewEditor editor = new ();
+
+        editor.Text = "Hello, World!";
+
+        Assert.Equal ("Hello, World!", editor.Text);
+    }
+
+    [Fact]
+    public void Text_SetNull_BecomesEmpty ()
+    {
+        TextViewEditor editor = new ();
+
+        editor.Text = null!;
+
+        Assert.Equal (string.Empty, editor.Text);
+    }
+
+    [Fact]
+    public void Lines_ReturnsCorrectCount ()
+    {
+        TextViewEditor editor = new ();
+
+        editor.Text = "Line1\nLine2\nLine3";
+
+        Assert.Equal (3, editor.Lines);
+    }
+
+    [Fact]
+    public void CurrentRow_AfterSetText_IsZero ()
+    {
+        TextViewEditor editor = new ();
+
+        editor.Text = "Line1\nLine2";
+
+        Assert.Equal (0, editor.CurrentRow);
+    }
+
+    [Fact]
+    public void CurrentColumn_AfterSetText_IsZero ()
+    {
+        TextViewEditor editor = new ();
+
+        editor.Text = "Hello";
+
+        Assert.Equal (0, editor.CurrentColumn);
+    }
+
+    [Fact]
+    public void InsertionPoint_SetAndGet ()
+    {
+        TextViewEditor editor = new ();
+
+        editor.Text = "Line1\nLine2\nLine3";
+        editor.InsertionPoint = new Point (3, 1);
+
+        Assert.Equal (1, editor.CurrentRow);
+        Assert.Equal (3, editor.CurrentColumn);
+        Assert.Equal (new Point (3, 1), editor.InsertionPoint);
+    }
+
+    [Fact]
+    public void InsertionPoint_ClampsToBounds ()
+    {
+        TextViewEditor editor = new ();
+
+        editor.Text = "AB\nCD";
+
+        // Set beyond line length
+        editor.InsertionPoint = new Point (100, 0);
+        Assert.Equal (2, editor.CurrentColumn);
+
+        // Set beyond line count
+        editor.InsertionPoint = new Point (0, 100);
+        Assert.Equal (1, editor.CurrentRow);
+    }
+
+    [Fact]
+    public void ReadOnly_DefaultFalse ()
+    {
+        TextViewEditor editor = new ();
+
+        Assert.False (editor.ReadOnly);
+    }
+
+    [Fact]
+    public void ReadOnly_SetTrue ()
+    {
+        TextViewEditor editor = new ();
+
+        editor.ReadOnly = true;
+
+        Assert.True (editor.ReadOnly);
+    }
+
+    [Fact]
+    public void TabWidth_DefaultIs4 ()
+    {
+        TextViewEditor editor = new ();
+
+        Assert.Equal (4, editor.TabWidth);
+    }
+
+    [Fact]
+    public void TabWidth_SetAndGet ()
+    {
+        TextViewEditor editor = new ();
+
+        editor.TabWidth = 8;
+
+        Assert.Equal (8, editor.TabWidth);
+    }
+
+    [Fact]
+    public void TabWidth_MinimumIsOne ()
+    {
+        TextViewEditor editor = new ();
+
+        editor.TabWidth = 0;
+
+        Assert.Equal (1, editor.TabWidth);
+    }
+
+    [Fact]
+    public void IsSelecting_DefaultFalse ()
+    {
+        TextViewEditor editor = new ();
+
+        editor.Text = "Hello";
+
+        Assert.False (editor.IsSelecting);
+    }
+
+    [Fact]
+    public void SelectedText_WhenNoSelection_ReturnsEmpty ()
+    {
+        TextViewEditor editor = new ();
+
+        editor.Text = "Hello";
+
+        Assert.Equal (string.Empty, editor.SelectedText);
+    }
+
+    [Fact]
+    public void SelectedLength_WhenNoSelection_ReturnsZero ()
+    {
+        TextViewEditor editor = new ();
+
+        editor.Text = "Hello";
+
+        Assert.Equal (0, editor.SelectedLength);
+    }
+
+    [Fact]
+    public void Load_Stream_LoadsContent ()
+    {
+        TextViewEditor editor = new ();
+
+        using MemoryStream stream = new (System.Text.Encoding.UTF8.GetBytes ("Stream content"));
+        editor.Load (stream);
+
+        Assert.Equal ("Stream content", editor.Text);
+    }
+
+    [Fact]
+    public void Load_NonExistentFile_ReturnsFalse ()
+    {
+        TextViewEditor editor = new ();
+
+        bool result = editor.Load ("/nonexistent/path/file.txt");
+
+        Assert.False (result);
+    }
+
+    [Fact]
+    public void ContentsChanged_RaisedOnTextChange ()
+    {
+        TextViewEditor editor = new ();
+        bool raised = false;
+        editor.ContentsChanged += (_, _) => raised = true;
+
+        editor.Text = "new content";
+
+        // ContentsChanged is raised via the document's Changed event
+        // When Text is set, it replaces the document content which fires Changed
+        Assert.True (raised);
+    }
+
+    [Fact]
+    public void SelectAll_SelectsEntireDocument ()
+    {
+        TextViewEditor editor = new ();
+
+        editor.Text = "Hello";
+        editor.SelectAll ();
+
+        Assert.True (editor.IsSelecting);
+        Assert.Equal ("Hello", editor.SelectedText);
+        Assert.Equal (5, editor.SelectedLength);
+    }
+
+    [Fact]
+    public void ClearSelection_RemovesSelection ()
+    {
+        TextViewEditor editor = new ();
+
+        editor.Text = "Hello";
+        editor.SelectAll ();
+        editor.ClearSelection ();
+
+        Assert.False (editor.IsSelecting);
+        Assert.Equal (string.Empty, editor.SelectedText);
+    }
+}
diff --git a/Tests/TextViewEditorTests/TextViewEditorTests.csproj b/Tests/TextViewEditorTests/TextViewEditorTests.csproj
new file mode 100644
index 0000000000..9e9dcfaef4
--- /dev/null
+++ b/Tests/TextViewEditorTests/TextViewEditorTests.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <UseAppHost>true</UseAppHost>
+    <IsTestProject>true</IsTestProject>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <NoLogo>true</NoLogo>
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit.runner.visualstudio" />
+    <PackageReference Include="xunit.v3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Terminal.Gui.TextViewEditor\Terminal.Gui.TextViewEditor.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="System.Drawing" />
+    <Using Include="Xunit" />
+  </ItemGroup>
+</Project>
diff --git a/nuget.config b/nuget.config
index 4dcc41f23c..147177efe2 100644
--- a/nuget.config
+++ b/nuget.config
@@ -14,6 +14,7 @@
   <packageSourceMapping>
     <packageSource key="nuget">
       <package pattern="*" />
+      <package pattern="Terminal.Gui.Editor" />
     </packageSource>
     <packageSource key="LocalPackages">
       <package pattern="Terminal.Gui*" />