diff --git a/code/cms/DocumentHtmlEditorFieldToolbar.php b/code/cms/DocumentHtmlEditorFieldToolbar.php
index b1318cf..08965a5 100644
--- a/code/cms/DocumentHtmlEditorFieldToolbar.php
+++ b/code/cms/DocumentHtmlEditorFieldToolbar.php
@@ -26,6 +26,8 @@ class DocumentHtmlEditorFieldToolbar extends Extension
         $addExistingField->setUseFieldClass(false);
         $fieldList->insertAfter($addExistingField, 'Description');
 
+        $fieldList->push(HiddenField::create('DMSShortcodeHandlerKey', false, DMS::inst()->getShortcodeHandlerKey()));
+
 //		Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
 //		Requirements::javascript(SAPPHIRE_DIR . "/javascript/tiny_mce_improvements.js");
 //
diff --git a/javascript/DocumentHtmlEditorFieldToolbar.js b/javascript/DocumentHtmlEditorFieldToolbar.js
index 7dd6919..7b81e63 100755
--- a/javascript/DocumentHtmlEditorFieldToolbar.js
+++ b/javascript/DocumentHtmlEditorFieldToolbar.js
@@ -92,7 +92,7 @@
         }
 
         // Match a document or call the regular link handling
-        if (href.match(new RegExp("/^\[" + this.getShortcodeKey() + "(\s*|%20|,)?id=([0-9]+)\]?$/", "i"))) {
+        if (href.match(new RegExp('^\\[' + this.getShortcodeKey() + '(\s*|%20|,)?id=([0-9]+)\\]?$', 'i'))) {
           var returnArray = {
             LinkType: 'document',
             DocumentID: RegExp.$2,