diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php
index 436c975d1..e577e4cef 100644
--- a/forms/HtmlEditorField.php
+++ b/forms/HtmlEditorField.php
@@ -278,8 +278,8 @@ class HtmlEditorField_Toolbar extends RequestHandler {
 	public function forTemplate() {
 		return sprintf(
 			'<div id="cms-editor-dialogs" data-url-linkform="%s" data-url-mediaform="%s"></div>',
-			Controller::join_links($this->controller->Link($this->name), 'LinkForm', 'forTemplate'),
-			Controller::join_links($this->controller->Link($this->name), 'MediaForm', 'forTemplate')
+			Controller::join_links($this->controller->Link(), $this->name, 'LinkForm', 'forTemplate'),
+			Controller::join_links($this->controller->Link(), $this->name, 'MediaForm', 'forTemplate')
 		);
 	}