Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java	(revision 20462)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java	(revision 20463)
@@ -70,8 +70,22 @@
         initConfig();
         dataSet = new DataSet();
-        uploadHook = new OsbUploadHook();
-        dialog = new OsbDialog(this);
-        MapView.addLayerChangeListener(dialog);
-        MapView.addLayerChangeListener(this);
+    }
+
+    @Override
+    public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+        if (newFrame != null) {
+            dialog = new OsbDialog(this);
+            newFrame.addToggleDialog(dialog);
+
+            MapView.addLayerChangeListener(dialog);
+            MapView.addLayerChangeListener(this);
+            
+            uploadHook = new OsbUploadHook();
+            UploadAction.registerUploadHook(uploadHook);
+        } else {
+        	MapView.removeLayerChangeListener(this);
+        	UploadAction.unregisterUploadHook(uploadHook);
+        	uploadHook = null;
+        }
     }
 
@@ -196,17 +210,4 @@
     }
 
-    @Override
-    public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
-        if (oldFrame==null && newFrame!=null) { // map frame added
-            // add the dialog
-            newFrame.addToggleDialog(dialog);
-
-            // add the upload hook
-            UploadAction.registerUploadHook(uploadHook);
-        } else if (oldFrame!=null && newFrame==null ) { // map frame removed
-
-        }
-    }
-
     public static ImageIcon loadIcon(String name) {
         return ImageProvider.get(name);
Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java	(revision 20462)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java	(revision 20463)
@@ -101,5 +101,5 @@
 
     public OsbDialog(final OsbPlugin plugin) {
-        super(tr("Open OpenStreetBugs"), "icon_error22",
+        super(tr("Open OpenStreetBugs"), "icon_error24",
                 tr("Opens the OpenStreetBugs window and activates the automatic download"), Shortcut.registerShortcut(
                         "view:openstreetbugs", tr("Toggle: {0}", tr("Open OpenStreetBugs")), KeyEvent.VK_O,