diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 19352c481e..6c0f6cba2e 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -1090,6 +1090,8 @@ void LLFilePicker::chooser_responder(GtkWidget *widget, gint response, gpointer
 	const char* cur_folder = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(widget));
 	if (cur_folder != NULL)
 	{
+		// <FS> FIRE-14924: Remember last used directory
+		//picker->mContextToPathMap[picker->mCurContextName] = cur_folder;
 		if (picker->mCurContextName == "openfile")
 		{
 			gSavedSettings.setString("FSFilePickerOpenDirectory", cur_folder);
@@ -1098,6 +1100,7 @@ void LLFilePicker::chooser_responder(GtkWidget *widget, gint response, gpointer
 		{
 			gSavedSettings.setString("FSFilePickerSaveDirectory", cur_folder);
 		}
+		// </FS>
 	}
 
 	gtk_widget_destroy(widget);
@@ -1135,6 +1138,15 @@ GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder, std::stri
 
 		// get the default path for this usage context if it's been
 		// seen before.
+		// <FS> FIRE-14924: Remember last used directory
+		//std::map<std::string,std::string>::iterator
+		//	this_path = mContextToPathMap.find(context);
+		//if (this_path != mContextToPathMap.end())
+		//{
+		//	gtk_file_chooser_set_current_folder
+		//		(GTK_FILE_CHOOSER(win),
+		//		 this_path->second.c_str());
+		//}
 		std::string this_path = "";
 		
 		if (context == "openfile")
@@ -1152,6 +1164,7 @@ GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder, std::stri
 				(GTK_FILE_CHOOSER(win),
 				 this_path.c_str());
 		}
+		// </FS>
 
 #  if LL_X11
 		// Make GTK tell the window manager to associate this
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h
index 69793f19c9..163997b31f 100644
--- a/indra/newview/llfilepicker.h
+++ b/indra/newview/llfilepicker.h
@@ -181,6 +181,8 @@ private:
 #if LL_GTK
 	static void add_to_selectedfiles(gpointer data, gpointer user_data);
 	static void chooser_responder(GtkWidget *widget, gint response, gpointer user_data);
+	// we remember the last path that was accessed for a particular usage
+	//std::map <std::string, std::string> mContextToPathMap; // <FS> FIRE-14924: Remember last used directory
 	std::string mCurContextName;
 	// we also remember the extension of the last added file.
 	std::string mCurrentExtension;