diff --git a/fpdfsdk/fpdf_formfill_embeddertest.cpp b/fpdfsdk/fpdf_formfill_embeddertest.cpp
index 6268d8a..6f33fa5 100644
--- a/fpdfsdk/fpdf_formfill_embeddertest.cpp
+++ b/fpdfsdk/fpdf_formfill_embeddertest.cpp
@@ -3210,6 +3210,19 @@
   EXPECT_EQ(FocusedFieldText(), "AB");
   EXPECT_TRUE(CanUndo());
   EXPECT_TRUE(CanRedo());
+  EXPECT_EQ(Selection(), "A");
+
+  PerformRedo();
+  EXPECT_EQ(FocusedFieldText(), "XYZB");
+  EXPECT_TRUE(CanUndo());
+  EXPECT_FALSE(CanRedo());
+  EXPECT_EQ(Selection(), "");  // The selection is not an undo item.
+
+  PerformUndo();
+  EXPECT_EQ(FocusedFieldText(), "AB");
+  EXPECT_TRUE(CanUndo());
+  EXPECT_TRUE(CanRedo());
+  EXPECT_EQ(Selection(), "A");
 
   SelectTextWithKeyboard(1, FWL_VKEY_Left, RegularFormEnd());
   EXPECT_EQ(Selection(), "B");
@@ -3272,36 +3285,43 @@
   EXPECT_EQ(FocusedFieldText(), "XYZB");
   EXPECT_TRUE(CanUndo());
   EXPECT_FALSE(CanRedo());
+  EXPECT_EQ(Selection(), "");
 
   PerformUndo();
   EXPECT_EQ(FocusedFieldText(), "AB");
   EXPECT_TRUE(CanUndo());
   EXPECT_TRUE(CanRedo());
+  EXPECT_EQ(Selection(), "A");
 
   PerformUndo();
   EXPECT_EQ(FocusedFieldText(), "A");
   EXPECT_TRUE(CanUndo());
   EXPECT_TRUE(CanRedo());
+  EXPECT_EQ(Selection(), "");
 
   PerformUndo();
   EXPECT_EQ(FocusedFieldText(), "");
   EXPECT_FALSE(CanUndo());
   EXPECT_TRUE(CanRedo());
+  EXPECT_EQ(Selection(), "");
 
   PerformRedo();
   EXPECT_EQ(FocusedFieldText(), "A");
   EXPECT_TRUE(CanUndo());
   EXPECT_TRUE(CanRedo());
+  EXPECT_EQ(Selection(), "");
 
   PerformRedo();
   EXPECT_EQ(FocusedFieldText(), "AB");
   EXPECT_TRUE(CanUndo());
   EXPECT_TRUE(CanRedo());
+  EXPECT_EQ(Selection(), "");
 
   PerformRedo();
   EXPECT_EQ(FocusedFieldText(), "XYZB");
   EXPECT_TRUE(CanUndo());
   EXPECT_FALSE(CanRedo());
+  EXPECT_EQ(Selection(), "");
 }
 
 TEST_F(FPDFFormFillTextFormEmbedderTest, ContinuouslyReplaceSelection) {
@@ -3321,6 +3341,7 @@
 
   PerformUndo();
   EXPECT_EQ(FocusedFieldText(), "");
+  EXPECT_EQ(Selection(), "");
 
   EXPECT_FALSE(CanUndo());
   EXPECT_TRUE(CanRedo());
diff --git a/fpdfsdk/pwl/cpwl_edit_impl.cpp b/fpdfsdk/pwl/cpwl_edit_impl.cpp
index 1a56f9e..a025eba 100644
--- a/fpdfsdk/pwl/cpwl_edit_impl.cpp
+++ b/fpdfsdk/pwl/cpwl_edit_impl.cpp
@@ -372,7 +372,6 @@
 CPWL_EditImpl::UndoReplaceSelection::~UndoReplaceSelection() = default;
 
 int CPWL_EditImpl::UndoReplaceSelection::Redo() {
-  edit_->SelectNone();
   if (IsEnd()) {
     return 0;
   }
@@ -382,7 +381,6 @@
 }
 
 int CPWL_EditImpl::UndoReplaceSelection::Undo() {
-  edit_->SelectNone();
   if (!IsEnd()) {
     return 0;
   }