diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp
index 7185fa3..ec67e0e 100644
--- a/fpdfsdk/formfiller/cffl_listbox.cpp
+++ b/fpdfsdk/formfiller/cffl_listbox.cpp
@@ -180,7 +180,7 @@
 
 void CFFL_ListBox::RecreatePWLWindowFromSavedState(
     CPDFSDK_PageView* pPageView) {
-  CPWL_ListBox* pListBox = GetListBox(pPageView);
+  CPWL_ListBox* pListBox = CreateOrUpdateListBox(pPageView);
   if (!pListBox)
     return;
 
@@ -224,3 +224,7 @@
 CPWL_ListBox* CFFL_ListBox::GetListBox(CPDFSDK_PageView* pPageView) const {
   return static_cast<CPWL_ListBox*>(GetPWLWindow(pPageView));
 }
+
+CPWL_ListBox* CFFL_ListBox::CreateOrUpdateListBox(CPDFSDK_PageView* pPageView) {
+  return static_cast<CPWL_ListBox*>(CreateOrUpdatePWLWindow(pPageView));
+}
diff --git a/fpdfsdk/formfiller/cffl_listbox.h b/fpdfsdk/formfiller/cffl_listbox.h
index 855915d..2c0a88e 100644
--- a/fpdfsdk/formfiller/cffl_listbox.h
+++ b/fpdfsdk/formfiller/cffl_listbox.h
@@ -39,6 +39,7 @@
 
  private:
   CPWL_ListBox* GetListBox(CPDFSDK_PageView* pPageView) const;
+  CPWL_ListBox* CreateOrUpdateListBox(CPDFSDK_PageView* pPageView);
 
   std::set<int> m_OriginSelections;
   std::vector<int> m_State;