diff --git a/CefSharp.WinForms.Example/BrowserTabUserControl.cs b/CefSharp.WinForms.Example/BrowserTabUserControl.cs
index 0a20c25bdc..28095a5b4d 100644
--- a/CefSharp.WinForms.Example/BrowserTabUserControl.cs
+++ b/CefSharp.WinForms.Example/BrowserTabUserControl.cs
@@ -33,8 +33,8 @@ public BrowserTabUserControl(string url)
             browser.StatusMessage += OnBrowserStatusMessage;
             browser.IsBrowserInitializedChanged += OnIsBrowserInitializedChanged;
             browser.IsLoadingChanged += OnIsLoadingChanged;
-            browser.HandleCreated += OnBrowserHandleCreated;
             browser.DragHandler = new DragHandler();
+            browser.RegisterJsObject("bound", new BoundObject());
 
             CefExample.RegisterTestResources(browser);
 
@@ -43,11 +43,6 @@ public BrowserTabUserControl(string url)
 
             Disposed += BrowserTabUserControlDisposed;
         }
-        
-        private void OnBrowserHandleCreated(object sender, EventArgs e)
-        {
-            Browser.RegisterJsObject("bound", new BoundObject());
-        }
 
         private void BrowserTabUserControlDisposed(object sender, EventArgs e)
         {
@@ -61,7 +56,6 @@ private void BrowserTabUserControlDisposed(object sender, EventArgs e)
             browser.StatusMessage -= OnBrowserStatusMessage;
             browser.IsBrowserInitializedChanged -= OnIsBrowserInitializedChanged;
             browser.IsLoadingChanged -= OnIsLoadingChanged;
-            browser.HandleCreated -= OnBrowserHandleCreated;
 
             browser.Dispose();
         }
diff --git a/CefSharp.WinForms.Example/Minimal/SimpleBrowserForm.cs b/CefSharp.WinForms.Example/Minimal/SimpleBrowserForm.cs
index 2ec7fb7e86..22125e2166 100644
--- a/CefSharp.WinForms.Example/Minimal/SimpleBrowserForm.cs
+++ b/CefSharp.WinForms.Example/Minimal/SimpleBrowserForm.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Windows.Forms;
+using CefSharp.Example;
 using CefSharp.WinForms.Example.Controls;
 
 namespace CefSharp.WinForms.Example.Minimal
@@ -30,14 +31,6 @@ public SimpleBrowserForm()
             Load += OnLoad;
         }
 
-        private void BrowserPaint(object sender, PaintEventArgs e)
-        {
-            browser.Paint -= BrowserPaint;
-
-            //Invalidate browser as short term fix for #522
-            browser.Invalidate();
-        }
-
         private void OnLoad(object sender, EventArgs e)
         {
             CreateBrowser();
@@ -56,7 +49,7 @@ private void CreateBrowser()
             browser.StatusMessage += OnBrowserStatusMessage;
             browser.TitleChanged += OnBrowserTitleChanged;
             browser.AddressChanged += OnBrowserAddressChanged;
-            browser.Paint += BrowserPaint;
+            browser.RegisterJsObject("bound", new BoundObject());
         }
 
         private void OnBrowserConsoleMessage(object sender, ConsoleMessageEventArgs args)
diff --git a/CefSharp.WinForms/ChromiumWebBrowser.cs b/CefSharp.WinForms/ChromiumWebBrowser.cs
index 40fea7ea82..5f424d1596 100644
--- a/CefSharp.WinForms/ChromiumWebBrowser.cs
+++ b/CefSharp.WinForms/ChromiumWebBrowser.cs
@@ -61,6 +61,8 @@ public ChromiumWebBrowser(string address)
 
             FocusHandler = new DefaultFocusHandler(this);
             ResourceHandler = new DefaultResourceHandler();
+
+            managedCefBrowserAdapter = new ManagedCefBrowserAdapter(this);
         }
 
         protected override void Dispose(bool disposing)
@@ -151,7 +153,6 @@ public void SendMouseWheelEvent(int x, int y, int deltaX, int deltaY)
 
         protected override void OnHandleCreated(EventArgs e)
         {
-            managedCefBrowserAdapter = new ManagedCefBrowserAdapter(this);
             managedCefBrowserAdapter.CreateBrowser(BrowserSettings ?? new BrowserSettings(), Handle, Address);
 
             base.OnHandleCreated(e);