diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp
index 86531cac2..217e3b9b6 100644
--- a/retroshare-gui/src/gui/RetroShareLink.cpp
+++ b/retroshare-gui/src/gui/RetroShareLink.cpp
@@ -519,7 +519,7 @@ QString RetroShareLink::title() const
 
 static QString encodeItem(QString item)
 {
-	return item.replace(" ", "%20");
+	return item.replace(" ", "%20").replace("&", "%26").replace("#", "%23");
 }
 
 QString RetroShareLink::toString() const