diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h
index 3f59b24a30..ab3325b33f 100644
--- a/include/wx/aui/framemanager.h
+++ b/include/wx/aui/framemanager.h
@@ -130,7 +130,6 @@ class wxAuiManagerEvent;
 
 using wxAuiDockUIPartArray = wxBaseArray<wxAuiDockUIPart>;
 using wxAuiDockInfoArray = wxBaseArray<wxAuiDockInfo>;
-using wxAuiPaneInfoArray = wxBaseArray<wxAuiPaneInfo>;
 using wxAuiDockInfoPtrArray = wxBaseArray<wxAuiDockInfo*>;
 using wxAuiPaneInfoPtrArray = wxBaseArray<wxAuiPaneInfo*>;
 
@@ -394,6 +393,13 @@ public:
 };
 
 
+// Note that this one must remain a wxBaseObjectArray, i.e. store pointers to
+// heap-allocated objects, as it is returned by wxAuiManager::GetPane() and the
+// existing code expects these pointers to remain valid even if the array is
+// modified.
+using wxAuiPaneInfoArray = wxBaseObjectArray<wxAuiPaneInfo>;
+
+
 
 class WXDLLIMPEXP_FWD_AUI wxAuiFloatingFrame;