Index: /CKEditor.NET/trunk/CHANGES.html
===================================================================
--- /CKEditor.NET/trunk/CHANGES.html	(revision 6737)
+++ /CKEditor.NET/trunk/CHANGES.html	(revision 6738)
@@ -77,5 +77,6 @@
 		<li><a href="http://dev.ckeditor.com/ticket/7283">#7283</a> : Text entered in the editor is not HTML-encoded.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/7285">#7285</a> : Certain configuration options are not properly escaped.</li>
-		<li><a href="http://dev.ckeditor.com/ticket/7558">#7558</a> : Custom toolbar does not work.</li>		
+		<li><a href="http://dev.ckeditor.com/ticket/7558">#7558</a> : Custom toolbar does not work.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7660">#7660</a> : Problem with toggling the visible status.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/7302">#7302</a> : It is impossible to customize the editor inside a master page and if attributes are placed in front of the control ID.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/7590">#7590</a> : Error in Visual Studio when trying to reset values in the Properties window.</li>
Index: /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs
===================================================================
--- /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs	(revision 6737)
+++ /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs	(revision 6738)
@@ -1016,6 +1016,7 @@
 		#region Override Method
 		private string timestamp = "?t=B1GG4Z6";
-		protected override void OnPreRender(EventArgs e)
-		{
+		protected override void OnLoad(EventArgs e)
+		{
+			base.OnLoad(e);
 			this.RegisterStartupScript(this.GetType(), "CKEDITOR_BASEPATH", string.Format("window.CKEDITOR_BASEPATH = '{0}/';\n", (this.CKEditorJSFile.StartsWith("~") ? this.ResolveUrl(this.BasePath) : this.BasePath)), true);
 			this.RegisterStartupScript(this.GetType(), "ckeditor", "<script src=\"" + (this.CKEditorJSFile.StartsWith("~") ? this.ResolveUrl(this.CKEditorJSFile) : this.CKEditorJSFile) + timestamp + "\" type=\"text/javascript\"></script>", false);