Index: NbSheet.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/NbSheet.java,v
retrieving revision 1.36
diff -u -r1.36 NbSheet.java
--- NbSheet.java	11 Jan 2007 14:30:03 -0000	1.36
+++ NbSheet.java	5 Feb 2007 23:30:41 -0000
@@ -123,8 +123,6 @@
             NbBundle.getBundle(NbSheet.class).getString ("ACSN_PropertiesSheet"));
         getAccessibleContext ().setAccessibleDescription (
             NbBundle.getBundle(NbSheet.class).getString ("ACSD_PropertiesSheet"));
-
-        updateGlobalListening();
     }
     
     /* Singleton accessor. As NbSheet is persistent singleton this
@@ -412,14 +410,25 @@
 
     /** Helper, listener variable must be initialized before
     * calling this */
-    private void updateGlobalListening() {
+    private void updateGlobalListening(boolean listen) {
         if (global) {
-            TopComponent.getRegistry().addPropertyChangeListener(
-                org.openide.util.WeakListeners.propertyChange (listener, TopComponent.getRegistry ())
-            );
+            if (listen) {
+                TopComponent.getRegistry().addPropertyChangeListener(
+                    listener);
+            } else {
+                TopComponent.getRegistry().removePropertyChangeListener (listener);
+            }
         }
     }
-
+    
+    protected void componentOpened() {
+        updateGlobalListening (true);
+    }
+    
+    protected void componentClosed() {
+        updateGlobalListening (false);
+    }
+    
     protected void componentDeactivated() {
         super.componentDeactivated();
         if (Utilities.isMac()) {