diff --git a/CASA.changes b/CASA.changes
index 3796037e..91c81035 100644
--- a/CASA.changes
+++ b/CASA.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr 13 08:43:10 MST 2006 - jnorman@novell.com
+- Bug 164949. Fix 'New Secret' menu option when FireFox tab is selected.
+  Comment out fix for 164181 (see below).  SessionId is not implemented
+
 -------------------------------------------------------------------
 Thu Apr 13 07:01:10 MST 2006 - jnorman@novell.com
 - Bug 164181.  Prevent multiple instances of CASA Manager on windows.
diff --git a/c_gui/CasaMain.cs b/c_gui/CasaMain.cs
index 2da37692..d7257554 100644
--- a/c_gui/CasaMain.cs
+++ b/c_gui/CasaMain.cs
@@ -770,7 +770,10 @@ namespace Novell.CASA.GUI
 				
 			switch(notebookStores.CurrentPage)			
 			{    		    		
-				case Common.STORE_MICASA:					
+				case Common.STORE_MICASA:
+
+					mmiNew.Sensitive = true;
+					
 					if( 0 != objMiCasa.tvSecretIDMiCasa.Selection.CountSelectedRows() )
 					{
 						mmiNew.Sensitive = mmiNewKey.Sensitive = true;
@@ -796,6 +799,9 @@ namespace Novell.CASA.GUI
 					break;
     		
 				case Common.STORE_KDEWALLET:
+
+					mmiNew.Sensitive = true;
+
 					if( 0 != objKdeWallet.tvSecretIDKdeWallet.Selection.CountSelectedRows() )
 					{
 						mmiNew.Sensitive = mmiNewKey.Sensitive = true;
@@ -807,6 +813,9 @@ namespace Novell.CASA.GUI
 					break;
     				
 				case Common.STORE_GNOMEKEYRING: 
+					
+					mmiNew.Sensitive = true;
+
 					if( 0 != objGnomeKeyring.tvSecretIDGnomeKeyring.Selection.CountSelectedRows() )
 					{
 						mmiNew.Sensitive = mmiNewKey.Sensitive = true;						
diff --git a/c_gui/Common.cs b/c_gui/Common.cs
index f015536e..ae417c0d 100644
--- a/c_gui/Common.cs
+++ b/c_gui/Common.cs
@@ -259,22 +259,22 @@ public class Common
 			
 		}
 		else if( true == IS_WINDOWS )
-		{
-
-            Process current = Process.GetCurrentProcess();
-            Process[] p = System.Diagnostics.Process.GetProcessesByName("CASAManager");
-            int i = 0;
-            foreach (Process proc in p)
-            {
-                Console.WriteLine(proc.SessionId);
-                if (proc.SessionId == current.SessionId)
-                    i++;
-            }
-
-            if (i > 1)
+		{
+#if DOTNET2
+            Process current = Process.GetCurrentProcess();
+            Process[] p = System.Diagnostics.Process.GetProcessesByName("CASAManager");
+            int i = 0;
+            foreach (Process proc in p)
+            {
+                if (proc.SessionId == current.SessionId)
+                    i++;
+            }
+
+            if (i > 1)
                 bRet = true;
             else
-    			bRet = false;			
+    			bRet = false;		
+#endif	
 		}	
 		return bRet;	
 	}