diff --git a/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx b/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx
index 4c65d01255..876624892d 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx
+++ b/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx
@@ -15,12 +15,13 @@
     <umb:JsInclude ID="JsInclude" runat="server" FilePath="splitbutton/jquery.splitbutton.js" PathNameAlias="UmbracoClient" />
     <umb:JsInclude ID="JsInclude1" runat="server" FilePath="Editors/EditTemplate.js" PathNameAlias="UmbracoClient" />
     <script type="text/javascript">
-        //this needs to be a global object for the doSubmit() to work
-        var editor;
-
+        
         jQuery(document).ready(function() {
             //create the editor
-            editor = new Umbraco.Editors.EditTemplate({
+            var editor = new Umbraco.Editors.EditTemplate({
+                templateAliasClientId: '<%= AliasTxt.ClientID %>',
+                templateNameClientId: '<%= NameTxt.ClientID %>',
+                saveButton: $("#<%= ((Control)SaveButton).ClientID %>"),
                 restServiceLocation: "<%= Url.GetSaveFileServicePath() %>",                    
                 umbracoPath: '<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>',
                 editorClientId: '<%= editorSource.ClientID %>',
@@ -39,12 +40,7 @@
 
             editor.init();
         });
-
-        function doSubmit() {
-            //this is called when the save button is clicked or invoked            
-            editor.save(jQuery('#<%= NameTxt.ClientID %>').val(), jQuery('#<%= AliasTxt.ClientID %>').val(), UmbEditor.GetCode());
-        }
-
+        
         //TODO: the below should be refactored into being part of the EditTemplate.js class but have left it here for now since i don't have time.
 
         function umbracoTemplateInsertMasterPageContentContainer() {
diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditTemplate.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditTemplate.js
index 77830eaad5..0a3bb45c5c 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditTemplate.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditTemplate.js
@@ -77,6 +77,12 @@
 
             var self = this;
 
+            //bind to the save event
+            this._opts.saveButton.click(function (event) {
+                event.preventDefault();
+                self.doSubmit();
+            });
+            
             $("#sb").click(function() {
                 self._insertCodeBlock();
             });
@@ -106,6 +112,10 @@
             });
         },
 
+        doSubmit: function() {            
+            this.save(jQuery('#' + this._opts.templateNameClientId).val(), jQuery('#' + this._opts.templateAliasClientId).val(), UmbEditor.GetCode());
+        },
+
         save: function(templateName, templateAlias, codeVal) {
             var self = this;
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
index 91835f44ab..4f2b8b017e 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
@@ -23,6 +23,7 @@ namespace umbraco.cms.presentation.settings
 	public partial class editTemplate : UmbracoEnsuredPage
 	{
 		private Template _template;
+        public MenuButton SaveButton;
 
 		public editTemplate()
 		{
@@ -97,13 +98,11 @@ namespace umbraco.cms.presentation.settings
             var props = Panel1.NewTabPage(ui.Text("properties"));
             props.Controls.Add(Pane7);
 
-            
-			var save = Panel1.Menu.NewButton();
-		    save.OnClientClick = "doSubmit()";
-            save.Text = ui.Text("save");
-            save.ButtonType = MenuButtonType.Primary;
-            save.ID = "save";
-
+            SaveButton = Panel1.Menu.NewButton();
+            SaveButton.Text = ui.Text("save");
+            SaveButton.ButtonType = MenuButtonType.Primary;
+            SaveButton.ID = "save";
+           
 			Panel1.Text = ui.Text("edittemplate");
 			pp_name.Text = ui.Text("name", UmbracoUser);
             pp_alias.Text = ui.Text("alias", UmbracoUser);