diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index ef0673f8c..3a04338b8 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -181,6 +181,7 @@ EditorPanel::EditorPanel (Thumbnail* tmb, rtengine::InitialImage* isrc) : parent
     else 
         saveAsDialog = new SaveAsDialog (Glib::get_user_special_dir (G_USER_DIRECTORY_PICTURES));
 
+    saveAsDialog->set_default_size (options.saveAsDialogWidth, options.saveAsDialogHeight);
 
 // connect listeners
     profilep->setProfileChangeListener (tpc);
@@ -591,6 +592,10 @@ void EditorPanel::saveAsPressed () {
     if (fname=="")
         return;
 
+    options.lastSaveAsPath = saveAsDialog->getDirectory ();
+    options.saveAsDialogWidth = saveAsDialog->get_width();
+    options.saveAsDialogHeight = saveAsDialog->get_height();
+
     SaveFormat sf = saveAsDialog->getFormat ();
     if (getExtension (fname)!=sf.format)
         fname = fname + "." + sf.format;
diff --git a/rtgui/options.cc b/rtgui/options.cc
index 86105534d..0af737b70 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -234,6 +234,8 @@ if (keyFile.has_group ("GUI")) {
     if (keyFile.has_key ("GUI", "WindowHeight"))     windowHeight   = keyFile.get_integer ("GUI", "WindowHeight");
     if (keyFile.has_key ("GUI", "DirBrowserWidth"))     dirBrowserWidth   = keyFile.get_integer ("GUI", "DirBrowserWidth");
     if (keyFile.has_key ("GUI", "DirBrowserHeight"))    dirBrowserHeight  = keyFile.get_integer ("GUI", "DirBrowserHeight");
+    if (keyFile.has_key ("GUI", "SaveAsDialogWidth"))     saveAsDialogWidth   = keyFile.get_integer ("GUI", "SaveAsDialogWidth");
+    if (keyFile.has_key ("GUI", "SaveAsDialogHeight"))     saveAsDialogHeight   = keyFile.get_integer ("GUI", "SaveAsDialogHeight");
     if (keyFile.has_key ("GUI", "ToolPanelWidth"))      toolPanelWidth    = keyFile.get_integer ("GUI", "ToolPanelWidth");
     if (keyFile.has_key ("GUI", "BrowserToolPanelWidth"))browserToolPanelWidth = keyFile.get_integer ("GUI", "BrowserToolPanelWidth");
     if (keyFile.has_key ("GUI", "HistoryPanelWidth"))   historyPanelWidth = keyFile.get_integer ("GUI", "HistoryPanelWidth");
@@ -354,6 +356,8 @@ int Options::saveToFile (Glib::ustring fname) {
     keyFile.set_integer ("GUI", "WindowHeight", windowHeight);
     keyFile.set_integer ("GUI", "DirBrowserWidth", dirBrowserWidth);
     keyFile.set_integer ("GUI", "DirBrowserHeight", dirBrowserHeight);
+    keyFile.set_integer ("GUI", "SaveAsDialogWidth", saveAsDialogWidth);
+    keyFile.set_integer ("GUI", "SaveAsDialogHeight", saveAsDialogHeight);
     keyFile.set_integer ("GUI", "ToolPanelWidth", toolPanelWidth);
     keyFile.set_integer ("GUI", "BrowserToolPanelWidth", browserToolPanelWidth);
     keyFile.set_integer ("GUI", "HistoryPanelWidth", historyPanelWidth);
diff --git a/rtgui/options.h b/rtgui/options.h
index 6b738877b..1d96eb1ba 100644
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -62,6 +62,8 @@ class Options {
     Glib::ustring startupPath;
     Glib::ustring profilePath;
     Glib::ustring lastSaveAsPath;
+    int saveAsDialogWidth;
+    int saveAsDialogHeight;
     int toolPanelWidth;
     int browserToolPanelWidth;
     int historyPanelWidth;