diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp
index cfcc6232501..6dc03da8a5d 100644
--- a/mozilla/widget/src/windows/nsWindow.cpp
+++ b/mozilla/widget/src/windows/nsWindow.cpp
@@ -1509,13 +1509,15 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT
             result = PR_TRUE;
             break;
 
-        case WM_SETFOCUS:
+        // Commenting these fixes several crashes, 
+        // but it is unclear whether we need these events or not
+        /*case WM_SETFOCUS:
             result = DispatchFocus(NS_GOTFOCUS);
             break;
 
         case WM_KILLFOCUS:
             result = DispatchFocus(NS_LOSTFOCUS);
-            break;
+            break;*/
 
         case WM_WINDOWPOSCHANGED: 
         {