diff --git a/src/apps/expander/ExpanderPreferences.cpp b/src/apps/expander/ExpanderPreferences.cpp
index 4c7fbb0c73..62d5bb734f 100644
--- a/src/apps/expander/ExpanderPreferences.cpp
+++ b/src/apps/expander/ExpanderPreferences.cpp
@@ -231,6 +231,10 @@ ExpanderPreferences::ExpanderPreferences(BMessage *settings)
 
 ExpanderPreferences::~ExpanderPreferences()
 {
+	if (fUsePanel && fUsePanel->RefFilter())
+		delete fUsePanel->RefFilter();
+
+	delete fUsePanel;
 }
 
 
diff --git a/src/apps/expander/ExpanderWindow.cpp b/src/apps/expander/ExpanderWindow.cpp
index c4166cb8f6..d264b89319 100644
--- a/src/apps/expander/ExpanderWindow.cpp
+++ b/src/apps/expander/ExpanderWindow.cpp
@@ -169,6 +169,14 @@ ExpanderWindow::ExpanderWindow(BRect frame, const entry_ref *ref, BMessage *sett
 
 ExpanderWindow::~ExpanderWindow()
 {
+	if (fDestPanel && fDestPanel->RefFilter())
+		delete fDestPanel->RefFilter();
+
+	if (fSourcePanel && fSourcePanel->RefFilter())
+		delete fSourcePanel->RefFilter();
+
+	delete fDestPanel;
+	delete fSourcePanel;
 }