diff --git a/xpfe/components/search/resources/search-panel.xul b/xpfe/components/search/resources/search-panel.xul
index 78d3f1c8942..25b39deca5e 100644
--- a/xpfe/components/search/resources/search-panel.xul
+++ b/xpfe/components/search/resources/search-panel.xul
@@ -45,7 +45,7 @@
     </popup>
   </popupset>
   
-  <box class="color-window groove-bottom box-padded outset-right" orient="vertical">
+  <box class="color-window groove-bottom box-padded outset-right" orient="vertical" context="">
     <box autostretch="never">
       	  <textfield id="sidebar-search-text" flex="1" onkeypress="if (event.keyCode == 13) return doSearch();" oninput="return doEnabling();" />
 		  <box autostretch="never">
@@ -147,7 +147,7 @@
 
     </box>
       
-    <box align="vertical" class="searchpanel-outerbox" flex="1">
+    <box align="vertical" class="searchpanel-outerbox" flex="1" context="">
       <tree id="searchengines" datasources="rdf:internetsearch"
             flex="1" class="inset">
         <template>
diff --git a/xpfe/components/sidebar/resources/sidebarOverlay.xul b/xpfe/components/sidebar/resources/sidebarOverlay.xul
index c5a0c950afe..e0d97026522 100644
--- a/xpfe/components/sidebar/resources/sidebarOverlay.xul
+++ b/xpfe/components/sidebar/resources/sidebarOverlay.xul
@@ -17,9 +17,10 @@
   Reserved.
 
 -->
+
  
 <?xml-stylesheet href="chrome://communicator/content/sidebar/sidebarOverlay.css" type="text/css"?> 
-
+<?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/sidebar/sidebarOverlay.dtd">
 
 <overlay id="sidebarOverlay"
@@ -123,9 +124,9 @@
                   <spring flex="100%"/>
                 </box>
                 <iframe class="iframe-panel" flex='1*' src="about:blank"
-                  hidden="true" collapsed="true" content="?content" />
+                  hidden="true" collapsed="true" content="?content" context="contentAreaContextMenu"/>
                 <iframe class="iframe-panel" flex='1*' src="about:blank"
-                  hidden="true" collapsed="true" content="?content" type="content" />
+                  hidden="true" collapsed="true" content="?content" type="content" context="contentAreaContextMenu"/>
               </box>
             </action>
           </rule>
@@ -138,6 +139,7 @@
         </box>
       </box>
     </box>
+    <popupset id="contentAreaContextSet"/>
   </box>
 
   <!-- Splitter on the right of sidebar -->