diff --git a/libcef/browser_impl_win.cc b/libcef/browser_impl_win.cc
index ad3fc1f3b..a1aa7194c 100644
--- a/libcef/browser_impl_win.cc
+++ b/libcef/browser_impl_win.cc
@@ -105,21 +105,8 @@ LRESULT CALLBACK CefBrowserImpl::WndProc(HWND hwnd, UINT message,
     return 0;
 
   case WM_SETFOCUS:
-    if (browser) {
-      WebViewHost* host = browser->UIT_GetWebViewHost();
-      if (host) {
-        bool handled = false;
-        CefRefPtr<CefClient> client = browser->GetClient();
-        if (client.get()) {
-          CefRefPtr<CefFocusHandler> handler = client->GetFocusHandler();
-          if (handler.get())
-            handled = handler->OnSetFocus(browser, FOCUS_SOURCE_SYSTEM);
-        }
-
-        if (!handled)
-          browser->UIT_SetFocus(host, true);
-      }
-    }
+    if (browser)
+      browser->SetFocus(true);
     return 0;
 
   case WM_ERASEBKGND: