diff --git a/docs/changes.txt b/docs/changes.txt
index d4065e281d..eb27c743f0 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -273,6 +273,8 @@ All (GUI):
 - Fix undefined behaviour in wxImage::Paste() (aurel32, #23791).
 - Fix EVT_PRESS_AND_TAP() event macro definition (Kumazuma, #23819).
 - Fix wxFileHistory formatting after calling Load() (Hartwig Wiesmann, #23799).
+- Fix wxRichTextCtrl layout in high DPI (mbc-one, Maarten Bent, #23828).
+- Ensure current cell stays valid when wxGrid table changes (CookieLau, #23751).
 
 wxGTK:
 
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 1472793bdd..6de9d9f814 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -2975,6 +2975,8 @@ wxGrid::SetTable(wxGridTableBase *table,
 
     InvalidateBestSize();
 
+    UpdateCurrentCellOnRedim();
+
     return m_created;
 }