diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index ffebb2b8cfd0..a96dc6c2236f 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -4668,9 +4668,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT
       break;
 
     case WM_ACTIVATE:
-      // Check high-order word. If nonzero, this message is about the window
-      // being minimized and must be disregarded here.
-      if (mEventCallback && HIWORD(wParam) == 0) {
+      if (mEventCallback) {
         PRInt32 fActive = LOWORD(wParam);
 
         if (WA_INACTIVE == fActive) {
@@ -4787,14 +4785,9 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT
         isMozWindowTakingFocus = PR_FALSE;
       }
       if (gJustGotDeactivate) {
-        gJustGotActivate = PR_FALSE;
         gJustGotDeactivate = PR_FALSE;
         result = DispatchFocus(NS_DEACTIVATE, isMozWindowTakingFocus);
       }
-      else if (gJustGotActivate) {
-        gJustGotActivate = PR_FALSE;
-        result = DispatchFocus(NS_ACTIVATE, PR_TRUE);
-      }
       result = DispatchFocus(NS_LOSTFOCUS, isMozWindowTakingFocus);
       break;
 
@@ -4893,6 +4886,25 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT
         InitEvent(event);
 
         result = DispatchWindowEvent(&event);
+
+        if (pl.showCmd == SW_SHOWMINIMIZED) {
+          // Deactivate
+          WCHAR className[kMaxClassNameLength];
+          ::GetClassNameW((HWND)wParam, className, kMaxClassNameLength);
+          if (wcscmp(className, kWClassNameUI) &&
+              wcscmp(className, kWClassNameContent) &&
+              wcscmp(className, kWClassNameContentFrame) &&
+              wcscmp(className, kWClassNameDialog) &&
+              wcscmp(className, kWClassNameGeneral)) {
+            isMozWindowTakingFocus = PR_FALSE;
+          }
+          gJustGotDeactivate = PR_FALSE;
+          result = DispatchFocus(NS_DEACTIVATE, isMozWindowTakingFocus);
+        } else if (pl.showCmd == SW_SHOWNORMAL){
+          // Make sure we're active
+          result = DispatchFocus(NS_GOTFOCUS, PR_TRUE);
+          result = DispatchFocus(NS_ACTIVATE, PR_TRUE);
+        }
       }
     }
     break;