diff --git a/gs/html-factory.gs b/gs/html-factory.gs
index 09b610b1c..26cfee9d6 100644
--- a/gs/html-factory.gs
+++ b/gs/html-factory.gs
@@ -11,7 +11,7 @@ function createHtmlArrayLinkButton(htmlType, url, listName) {
                     return "<a href=\"" + url + "\" title=\"Preview " + listName + " in your browser.\" class=\"button piwik_download\">View</a>";
                     break;
                 case "addUrl":
-                    return "<a href=\"abp:subscribe?location=" + url + "&title=" + listName + "\" title=\"Subscribe to " + listName + " in your content blocker.\" class=\"button piwik_download\">Add</a>";
+                    return "<a href=\"abp:subscribe?location=" + encodeUrlArray(url) + "&title=" + encodeUrlArray(listName) + "\" title=\"Subscribe to " + listName + " in your content blocker.\" class=\"button piwik_download\">Add</a>";
                     break;
                 case "homeUrl":
                     return "<a href=\"" + url + "\" title=\"" + listName + " Home Page\" class=\"button\">Home</a>";