diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
index ca0b830..1d85dd1 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
@@ -53,7 +53,6 @@ import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.tools.bugreport.BugReport;
 import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
 
 /**
@@ -99,15 +98,17 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
         addComponentListener(
                 new ComponentAdapter() {
                     @Override
+                    public void componentShown(ComponentEvent e) {
+                        Main.getLayerManager().addAndFireActiveLayerChangeListener(actSelectInCurrentLayerAction);
+                        Main.getLayerManager().addAndFireActiveLayerChangeListener(actZoomInCurrentLayerAction);
+                    };
+
+                    @Override
                     public void componentHidden(ComponentEvent e) {
                         // make sure the listener is unregistered when the panel becomes
                         // invisible
-                        try {
-                            Main.getLayerManager().removeActiveLayerChangeListener(actSelectInCurrentLayerAction);
-                            Main.getLayerManager().removeActiveLayerChangeListener(actZoomInCurrentLayerAction);
-                        } catch (IllegalArgumentException t) {
-                            throw BugReport.intercept(t).put("hint", "This Component can only be hidden once.");
-                        }
+                        Main.getLayerManager().removeActiveLayerChangeListener(actSelectInCurrentLayerAction);
+                        Main.getLayerManager().removeActiveLayerChangeListener(actZoomInCurrentLayerAction);
                     }
                 }
         );
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
index c875d2d..17bedad 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
@@ -95,6 +95,12 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
         addComponentListener(
                 new ComponentAdapter() {
                     @Override
+                    public void componentShown(ComponentEvent e) {
+                        Main.getLayerManager().addAndFireActiveLayerChangeListener(actSelectInCurrentLayer);
+                        Main.getLayerManager().addAndFireActiveLayerChangeListener(actZoomInCurrentLayerAction);
+                    };
+
+                    @Override
                     public void componentHidden(ComponentEvent e) {
                         // make sure the listener is unregistered when the panel becomes
                         // invisible