diff --git a/indra/newview/llfloatercreatelandmark.cpp b/indra/newview/llfloatercreatelandmark.cpp
index eb93a6a75addf102481b68cc4df44b2b8895d1b0..813b7ceec892521184fa885e7e6c643be8dcf00d 100644
--- a/indra/newview/llfloatercreatelandmark.cpp
+++ b/indra/newview/llfloatercreatelandmark.cpp
@@ -143,7 +143,7 @@ void LLFloaterCreateLandmark::setLandmarkInfo(const LLUUID &folder_id)
 		mLandmarkTitleEditor->setText(name);
 	}
 
-	LLLandmarkActions::createLandmarkHere(name, "", folder_id.notNull() ? folder_id : gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE));
+	LLLandmarkActions::createLandmarkHere(name, "", folder_id.notNull() ? folder_id : mLandmarksID);
 }
 
 bool cmp_folders(const folder_pair_t& left, const folder_pair_t& right)
@@ -202,6 +202,10 @@ void LLFloaterCreateLandmark::populateFoldersList(const LLUUID &folder_id)
 	{
 		mFolderCombo->setCurrentByID(folder_id);
 	}
+    else
+    {
+        mFolderCombo->setCurrentByID(mLandmarksID);
+    }
 }
 
 void LLFloaterCreateLandmark::onCreateFolderClicked()
@@ -320,4 +324,4 @@ void LLFloaterCreateLandmark::setItem(const uuid_set_t& items)
 			}
 		}
 	}
-}
\ No newline at end of file
+}