diff --git a/src/apps/terminal/PrefWindow.cpp b/src/apps/terminal/PrefWindow.cpp
index 4b02c6d1bb..c80941c7bd 100644
--- a/src/apps/terminal/PrefWindow.cpp
+++ b/src/apps/terminal/PrefWindow.cpp
@@ -114,8 +114,10 @@ PrefWindow::QuitRequested()
 void
 PrefWindow::_SaveAs()
 {
-	if (!fSavePanel)
-		fSavePanel = new BFilePanel(B_SAVE_PANEL, new BMessenger(this));
+	if (!fSavePanel) {
+		BMessenger messenger(this);
+		fSavePanel = new BFilePanel(B_SAVE_PANEL, &messenger);
+	}
 	
 	fSavePanel->Show();
 }