diff --git a/src/network/server.cpp b/src/network/server.cpp
index dc06a01c2..c092c4c0c 100644
--- a/src/network/server.cpp
+++ b/src/network/server.cpp
@@ -243,7 +243,8 @@ void Server::setAddress(const SocketAddress& addr)
 // ----------------------------------------------------------------------------
 std::string Server::getBookmarkKey() const
 {
-    return StringUtils::xmlEncode(m_name) +
+    core::stringw name = m_name;
+    return StringUtils::xmlEncode(name.trim().removeChars(L"\n\r\t")) +
         StringUtils::toString(m_server_owner);
 }   // getBookmarkKey