diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 1098780e7..bc4c833f1 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.6.8
  - Updated captcha images to be more legible.
+ - fixed #9285: modifing template prevents edit of syncontent
 
 7.6.7
  - fixed #9263: Thingy possibleValues processing, and List type autodetection.
@@ -18,8 +19,7 @@
  - fixed #8898: versioning problem
  - fixed #9315: Password Recovery
  - fixed #9298: Inconsistent date formats
- - fixed #9296: Thingy View template not recognising field_isVisible (SDH
-   Consulting Group)
+ - fixed #9296: Thingy View template not recognising field_isVisible (SDH Consulting Group)
 
 7.6.6
  - fixed #8792: Image Preview gives ERROR in Collateral Manager
diff --git a/lib/WebGUI/Form/Template.pm b/lib/WebGUI/Form/Template.pm
index 71cb0120e..84da377bb 100644
--- a/lib/WebGUI/Form/Template.pm
+++ b/lib/WebGUI/Form/Template.pm
@@ -168,18 +168,22 @@ Renders the form field to HTML as a table row complete with labels, subtext, hov
 =cut
 
 sub toHtmlWithWrapper {
-	my $self = shift;
-	my $template = WebGUI::Asset::Template->new($self->session,$self->getOriginalValue());
+    my $self = shift;
+    my $session = $self->session;
+    my $template = WebGUI::Asset::Template->new($session,$self->getOriginalValue());
         if (defined $template && $template->canEdit) {
-                my $returnUrl;
-                if (defined $self->session->asset && ref $self->session->asset ne "WebGUI::Asset::Template") {
-                        $returnUrl = ";proceed=goBackToPage;returnUrl=".$self->session->url->escape($self->session->asset->getUrl);
-                }
-                my $buttons = $self->session->icon->edit("func=edit".$returnUrl,$template->get("url"));
-                $buttons .= $self->session->icon->manage("op=assetManager",$template->getParent->get("url"));
-		$self->set("subtext",$buttons . $self->get("subtext"));
-	}
-	return $self->SUPER::toHtmlWithWrapper;
+            my $returnUrl;
+            if (defined $session->asset && ref $session->asset ne "WebGUI::Asset::Template") {
+                $returnUrl = ";proceed=goBackToPage;returnUrl=".$session->url->escape($self->session->asset->getUrl);
+            }
+            my $buttons = $session->icon->edit("func=edit".$returnUrl,$template->get("url"));
+            my $parent = $template->getParent();
+            if (defined $parent) {
+                $buttons .= $session->icon->manage("op=assetManager",$template->getParent->get("url"));
+            }
+        $self->set("subtext",$buttons . $self->get("subtext"));
+    }
+    return $self->SUPER::toHtmlWithWrapper;
 }
 
 1;