diff --git a/src/apps/stylededit/StyledEditWindow.cpp b/src/apps/stylededit/StyledEditWindow.cpp
index 968581fc57..b8ecf940ef 100644
--- a/src/apps/stylededit/StyledEditWindow.cpp
+++ b/src/apps/stylededit/StyledEditWindow.cpp
@@ -660,7 +660,15 @@ status_t
 StyledEditWindow::SaveAs()
 {
 	if (fSavePanel == 0) {
-		fSavePanel = new BFilePanel(B_SAVE_PANEL, new BMessenger(this), NULL, B_FILE_NODE, false);
+		entry_ref * directory = 0;
+		if (fSaveMessage != 0) {
+			entry_ref dirref;
+			if (fSaveMessage->FindRef("directory", &dirref)) {
+				directory = new entry_ref(dirref);
+			}
+		}
+		fSavePanel = new BFilePanel(B_SAVE_PANEL, new BMessenger(this), directory, B_FILE_NODE, false);
+		
 		fSavePanelTextView = 
 		   dynamic_cast<BTextControl*>(fSavePanel->Window()->FindView("text view"));
 		BMenuBar * menuBar =