diff --git a/indra/newview/fspanelradar.cpp b/indra/newview/fspanelradar.cpp
index a1719eee59..a428d13ed8 100644
--- a/indra/newview/fspanelradar.cpp
+++ b/indra/newview/fspanelradar.cpp
@@ -122,9 +122,7 @@ FSPanelRadar::~FSPanelRadar()
 
 BOOL FSPanelRadar::postBuild()
 {
-	// AO: radarlist takes over for nearbylist for presentation.
 	mRadarList = getChild<FSRadarListCtrl>("radar_list");
-	mRadarList->sortByColumn("range", TRUE); // sort by range
 	mRadarList->setFilterColumn(0);
 	mRadarList->setContextMenu(&FSFloaterRadarMenu::gFSRadarMenu);
 	mRadarList->setDoubleClickCallback(boost::bind(&FSPanelRadar::onRadarListDoubleClicked, this));
@@ -500,7 +498,7 @@ void FSPanelRadar::onColumnDisplayModeChanged()
 		parent_floater->reshape(min_width, parent_floater->getRect().getHeight());
 	}
 
-	if (mRadarList->getColumn(current_sort_col)->getWidth() == -1)
+	if (current_sort_col.empty() || mRadarList->getColumn(current_sort_col)->getWidth() == -1)
 	{
 		current_sort_col = "range";
 		current_sort_asc = TRUE;
diff --git a/indra/newview/skins/ansastorm/xui/en/panel_fs_radar.xml b/indra/newview/skins/ansastorm/xui/en/panel_fs_radar.xml
index f8e35c2af9..553e6c0ea1 100644
--- a/indra/newview/skins/ansastorm/xui/en/panel_fs_radar.xml
+++ b/indra/newview/skins/ansastorm/xui/en/panel_fs_radar.xml
@@ -173,6 +173,7 @@
 						 draw_stripes="true"
 						 multi_select="true"
 						 content_type="Agents"
+						 persist_sort_order="true"
 						 width="321">
 							<radar_list.columns
 							 label="Name"
diff --git a/indra/newview/skins/default/xui/en/panel_fs_radar.xml b/indra/newview/skins/default/xui/en/panel_fs_radar.xml
index ad2e99521f..5abf734c5e 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_radar.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_radar.xml
@@ -173,6 +173,7 @@
 						 draw_stripes="true"
 						 multi_select="true"
 						 content_type="Agents"
+						 persist_sort_order="true"
 						 width="321">
 							<radar_list.columns
 							 label="Name"
diff --git a/indra/newview/skins/vintage/xui/en/panel_fs_radar.xml b/indra/newview/skins/vintage/xui/en/panel_fs_radar.xml
index 3fce891b55..59e6e53e2f 100644
--- a/indra/newview/skins/vintage/xui/en/panel_fs_radar.xml
+++ b/indra/newview/skins/vintage/xui/en/panel_fs_radar.xml
@@ -89,6 +89,7 @@
 				 draw_stripes="true"
 				 multi_select="true"
 				 content_type="Agents"
+				 persist_sort_order="true"
 				 width="327">
 					<radar_list.columns
 					 label="Name"