diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
index 11f1d7d5c6d..f38fa83e1dd 100644
--- a/suite/browser/navigator.js
+++ b/suite/browser/navigator.js
@@ -414,8 +414,14 @@ function Startup()
       remoteService.addBrowserInstance(window);
     }
   }
+  
+  // called when we go into full screen, even if it is 
+  // initiated by a web page script
+  addEventListener("fullscreen", onFullScreen, false);
+
   // now load bookmarks after a delay
   setTimeout(LoadBookmarksCallback, 0);
+
 }
 
 function LoadBookmarksCallback()
@@ -1543,3 +1549,14 @@ function FillInPTTooltip(tipElement)
 
   return true; // show tooltip
 }
+
+function BrowserFullScreen()
+{
+  window.fullScreen = !window.fullScreen;
+}
+
+function onFullScreen()
+{
+  FullScreen.toggle();
+}
+
diff --git a/suite/browser/navigator.xul b/suite/browser/navigator.xul
index f1eed6eeccd..080eb84b37d 100644
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -60,6 +60,7 @@ Contributor(s): ______________________________________. -->
   <script type="application/x-javascript" src="chrome://global/content/nsClipboard.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/fullscreen.js"/>
   
   <!-- Content Area -->
   <script type="application/x-javascript" src="chrome://navigator/content/nsBrowserStatusHandler.js"/>
@@ -124,7 +125,7 @@ Contributor(s): ______________________________________. -->
 
     <toolbar class="toolbar-primary chromeclass-toolbar" id="nav-bar" persist="collapsed" 
              grippytooltiptext="&navigationToolbar.tooltip;"
-             tbalign="stretch">
+             tbalign="stretch" fullscreentoolbar="true">
       <hbox id="nav-bar-buttons">
         <toolbarbutton id="back-button" type="menu-button" class="toolbarbutton-1"
                        label="&backButton.label;"
@@ -217,6 +218,17 @@ Contributor(s): ______________________________________. -->
         <button id="navigator-throbber" oncommand="goClickThrobber('browser.throbber.url')"
                 tooltiptext="&throbber.tooltip;"/>
       </hbox>
+      
+      <hbox id="window-controls" hidden="true" fullscreencontrol="true">
+        <toolbarbutton id="minimize-button" class="toolbarbutton-1"
+                       oncommand="window.minimize();"/>
+
+        <toolbarbutton id="restore-button" class="toolbarbutton-1"
+                       oncommand="BrowserFullScreen();"/>
+
+        <toolbarbutton id="close-button" class="toolbarbutton-1"
+                       oncommand="window.close();"/>
+      </hbox>
     </toolbar>
   
     <toolbar id="PersonalToolbar" class="chromeclass-directories" persist="collapsed" dragdroparea="innermostBox"
diff --git a/suite/browser/navigatorOverlay.xul b/suite/browser/navigatorOverlay.xul
index bb9b004b19e..45eb75b8858 100644
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -135,6 +135,7 @@
     <!-- View Menu -->
     <command id="View:PageSource" oncommand="BrowserViewSource();"/>
     <command id="View:PageInfo"   oncommand="BrowserPageInfo(getBrowser().contentDocument);"/>
+    <command id="View:FullScreen" oncommand="BrowserFullScreen();"/>
   
     <!-- Search Menu -->
     <command id="Browser:Find" oncommand="BrowserFind();" observes="isImage"/>
@@ -226,6 +227,9 @@
             <menuitem label="&componentbarCmd.label;" accesskey="&componentbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" observes="cmd_viewcomponentbar"/>
           </menupopup>
         </menu>   
+        <menuitem id="menuitem_fullScreen" accesskey="&fullScreenCmd.accesskey;"
+                  label="&fullScreenCmd.label;" key="key_fullScreen"
+                  command="View:FullScreen" hidden="true"/>
         <menuseparator />
   
         <!-- overlayed from viewZoomOverlay.xul -->
diff --git a/suite/browser/win/platformNavigationBindings.xul b/suite/browser/win/platformNavigationBindings.xul
index 8c3fe14b5f6..15ed8b1d624 100644
--- a/suite/browser/win/platformNavigationBindings.xul
+++ b/suite/browser/win/platformNavigationBindings.xul
@@ -20,8 +20,10 @@
 
     <key id="goHome" keycode="VK_HOME" command="Browser:Home" modifiers="alt"/>
 
+    <key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/>
   </keyset>  
 
+  <menuitem id="menuitem_fullScreen" hidden="false"/>
 </overlay>
 
 
diff --git a/suite/locales/en-US/chrome/browser/navigator.dtd b/suite/locales/en-US/chrome/browser/navigator.dtd
index a100d86dc5e..54928cb82f2 100644
--- a/suite/locales/en-US/chrome/browser/navigator.dtd
+++ b/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -63,6 +63,8 @@
 <!ENTITY pageInfoCmd.label "Page Info">
 <!ENTITY pageInfoCmd.accesskey "i">
 <!ENTITY pageInfoCmd.commandkey "i">
+<!ENTITY fullScreenCmd.label "Full Screen">
+<!ENTITY fullScreenCmd.accesskey "f">
 <!ENTITY translateMenu.label "Translate">
 <!ENTITY translateMenu.accesskey "T">
 <!ENTITY translate.commandKey "t">