diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index e18d7405ab..344791f491 100755
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -204,10 +204,10 @@ std::string LLUrlEntryBase::urlToGreyQuery(const std::string &url) const
 {
 	LLUriParser up(unescapeUrl(url));
 
-	std::string query;
+	std::string label;
 	up.extractParts();
-	up.glueSecond(query);
-
+	up.glueFirst(label);
+	std::string query = url.substr(label.size());
 	return query;
 }