diff --git a/c_gui/CasaMain.cs b/c_gui/CasaMain.cs
index 39a34d4a..39965afb 100644
--- a/c_gui/CasaMain.cs
+++ b/c_gui/CasaMain.cs
@@ -669,6 +669,11 @@ namespace Novell.CASA.GUI
 							dialogFirefoxMP.SetPosition(Gtk.WindowPosition.CenterOnParent);
 							dialogFirefoxMP.TransientFor = windowMain;
 						}
+						else
+						{
+							objFirefox.AggregateStore();
+							objFirefox.IS_STORE_AGGREGATED = true;
+						}
 					}
 					break;
     				
@@ -1474,17 +1479,7 @@ namespace Novell.CASA.GUI
 			if(Common.IS_FIREFOX)
 			{
 				if( null == objFirefox )
-				{
-					/*if( StoreDataInterface.IsMasterPasswordSet(Common.STORE_FIREFOX) )
-					{
-						Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogPreferences", null);
-						gxmlTemp.Autoconnect (this);
-						dialogFirefoxMP.SetPosition(Gtk.WindowPosition.CenterOnParent);
-						dialogFirefoxMP.TransientFor = windowMain;		
-					
-					}*/
-					objFirefox = new Firefox();				
-				}
+					objFirefox = new Firefox();
 				//objFirefox.AggregateStore();
 				notebookStores.GetNthPage(Common.STORE_FIREFOX).Visible = true;
 				StorePolicyInterface.SetAggregationPolicy(Common.STORE_FIREFOX, true, storeID, 1);