2 files changed, 7 insertions, 0 deletions
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 1d757c78d138..b5e333585264 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -911,6 +911,12 @@ void ONavigator::GetFocus()
         m_pImpl->m_pNavigatorTree->GrabFocus();
 }
 
+void ONavigator::dispose()
+{
+    m_pImpl->m_pNavigatorTree.disposeAndClear();
+    FloatingWindow::dispose();
+}
+
 } // rptui
 
 
diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx
index ef31fa2fe063..29f6e28f4c33 100644
--- a/reportdesign/source/ui/inc/Navigator.hxx
+++ b/reportdesign/source/ui/inc/Navigator.hxx
@@ -38,6 +38,7 @@ namespace rptui
 
         // window
         virtual void GetFocus() override;
+        virtual void dispose() override;
     };
 
 } // namespace rptui