diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index cd7495b3c5a..3e9f7e411d6 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -2307,7 +2307,7 @@ NS_METHOD nsWindow::Invalidate(const nsIntRect & aRect, PRBool aIsSynchronous)
 NS_IMETHODIMP
 nsWindow::MakeFullScreen(PRBool aFullScreen)
 {
-#if WINCE
+#if WINCE_WINDOWS_MOBILE
   RECT rc;
   if (aFullScreen) {
     SetForegroundWindow(mWnd);
@@ -2319,10 +2319,12 @@ nsWindow::MakeFullScreen(PRBool aFullScreen)
     SystemParametersInfo(SPI_GETWORKAREA, 0, &rc, FALSE);
   }
   MoveWindow(mWnd, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, TRUE);
-  return NS_OK;
-#else
-  return nsBaseWidget::MakeFullScreen(aFullScreen);
+
+  if (aFullScreen)
+    mSizeMode = nsSizeMode_Fullscreen;
 #endif
+
+  return nsBaseWidget::MakeFullScreen(aFullScreen);
 }
 
 /**************************************************************
diff --git a/widget/src/windows/nsWindowCE.cpp b/widget/src/windows/nsWindowCE.cpp
index 29ecb6e4114..fc7d2fd7ccd 100644
--- a/widget/src/windows/nsWindowCE.cpp
+++ b/widget/src/windows/nsWindowCE.cpp
@@ -346,6 +346,10 @@ NS_IMETHODIMP nsWindow::SetSizeMode(PRInt32 aMode)
     if (aMode == nsSizeMode_Normal)
       aMode = nsSizeMode_Maximized;
   }
+
+  // also on windows mobile, we never minimize.
+  if (aMode == nsSizeMode_Minimized)
+    return NS_OK;
 #endif
 
   // save the requested state