diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 4e1624ef8..b01d63664 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -63,6 +63,8 @@
  - fix: Email validate codes aren't removed after use
  - fix: Session variables still used in Help docs (perlDreamer Consulting, LLC)
     http://www.webgui.org/bugs/tracker/session-variables-still-used-in-help-docs
+ - fix: Editing a template sometimes fails (perlDreamer Consulting, LLC)
+    http://www.webgui.org/bugs/tracker/editing-a-template-sometimes-fails
 
 7.3.19
  - Fixed a formatting problem in the workflow editor screen.
diff --git a/lib/WebGUI/Help/Asset_Template.pm b/lib/WebGUI/Help/Asset_Template.pm
index 2ea159404..fa17738da 100644
--- a/lib/WebGUI/Help/Asset_Template.pm
+++ b/lib/WebGUI/Help/Asset_Template.pm
@@ -168,7 +168,7 @@ our $HELP = {
 			closedir(DIR);
 
 			##Build list of enabled macros, by namespace, by reversing session hash:
-			my @enabledPlugins = map { s/^WebGUI::Asset::Template:://; $_ } @{ $session->config->get("templateParsers") };
+			my @enabledPlugins = map { m/^WebGUI::Asset::Template::(\S+)//; $1 } @{ $session->config->get("templateParsers") };
 			my $defaultParser = $session->config->get('defaultTemplateParser');
 			$defaultParser =~ s/^WebGUI::Asset::Template:://;
 			my %enabledPlugins = map { $_ => 1 } @enabledPlugins;