diff --git a/src/App/AppKeyHandler.cs b/src/App/AppKeyHandler.cs
index f8f7af9..f7a27f3 100644
--- a/src/App/AppKeyHandler.cs
+++ b/src/App/AppKeyHandler.cs
@@ -179,7 +179,7 @@ internal bool HandleActionMenu()
         }
 
         var handler = new ColumnActionHandler(
-            _app, mt.Table, mt.Value.Cursor.X,
+            _app, mt.Table, mt.Value.SelectedCell.X,
             mt.GetRawColumnName, mt.OnMorphAction, format.Value, mt.IsRowIndexComplete);
 
         using var dialog = new ActionMenuDialog(ColumnActionHandler.GetAvailableActions(), handler.ExecuteAction);
diff --git a/src/App/DataMorph.App.csproj b/src/App/DataMorph.App.csproj
index e5aa99a..a54565a 100644
--- a/src/App/DataMorph.App.csproj
+++ b/src/App/DataMorph.App.csproj
@@ -6,7 +6,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Terminal.Gui" Version="2.0.1" />
+    <PackageReference Include="Terminal.Gui" Version="2.1.0" />
     <PackageReference Include="Sep" Version="0.14.1" />
   </ItemGroup>
 
diff --git a/src/App/ViewManager.cs b/src/App/ViewManager.cs
index 20f12ab..17a85d1 100644
--- a/src/App/ViewManager.cs
+++ b/src/App/ViewManager.cs
@@ -347,7 +347,7 @@ void onReady()
             {
                 // Only set if this view is still active and the user hasn't moved the cursor yet
                 if (_currentView == view && view.Table is not null && view.Table.Rows > 0
-                    && (view.Value is null || view.Value.Cursor.Y <= 0))
+                    && (view.Value is null || view.Value.SelectedCell.Y <= 0))
                 {
                     view.SetSelection(0, 0, false);
                     view.Update();
diff --git a/src/App/Views/MorphTableView.cs b/src/App/Views/MorphTableView.cs
index 42da679..600971d 100644
--- a/src/App/Views/MorphTableView.cs
+++ b/src/App/Views/MorphTableView.cs
@@ -50,7 +50,7 @@ void moveToRow(int row)
                 return;
             }
 
-            SetSelection(col: Value.Cursor.X, row: row, extendExistingSelection: false);
+            SetSelection(col: Value.SelectedCell.X, row: row, extendExistingSelection: false);
             Update();
             SetNeedsDraw();
         }