diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index f03fdecaaae..52f2c75b786 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -1459,6 +1459,12 @@ NS_METHOD nsWindow::SetFocus(void)
     }
 
     if (mWnd) {
+        // Uniconify, if necessary
+        HWND toplevelWnd = mWnd;
+        while (::GetParent(toplevelWnd))
+            toplevelWnd = ::GetParent(toplevelWnd);
+        if (::IsIconic(toplevelWnd))
+            ::OpenIcon(toplevelWnd);
         ::SetFocus(mWnd);
     }
     return NS_OK;