Index: /applications/editors/josm/plugins/openstreetbugs/build.xml
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 17353)
+++ /applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 17354)
@@ -26,5 +26,5 @@
                 <attribute name="Plugin-Description" value="Imports issues from OpenStreetBugs"/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/OpenStreetBugs"/>
-                <attribute name="Plugin-Mainversion" value="1893"/>
+                <attribute name="Plugin-Mainversion" value="2010"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
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 17353)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java	(revision 17354)
@@ -209,22 +209,4 @@
             hooks.add(0, uploadHook);
             
-            // add a listener to the plugin toggle button
-            final JToggleButton toggle = (JToggleButton) dialog.action.button;
-            active = toggle.isSelected();
-            toggle.addActionListener(new ActionListener() {
-                private boolean download = true;
-                
-                public void actionPerformed(ActionEvent e) {
-                    active = toggle.isSelected();
-                    if (toggle.isSelected() && download) {
-                        Main.worker.execute(new Runnable() {
-                            public void run() {
-                                updateData();
-                            }
-                        });
-                        download = false;
-                    }
-                }
-            });
         } else if (oldFrame!=null && newFrame==null ) { // map frame removed
             
@@ -241,5 +223,5 @@
     public void layerAdded(Layer newLayer) {
         if(newLayer instanceof OsmDataLayer) {
-            active = ((JToggleButton)dialog.action.button).isSelected();
+            active = dialog.isDialogShowing();
             
             // start the auto download loop
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 17353)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java	(revision 17354)
@@ -311,3 +311,21 @@
 
     }
+
+    private boolean downloaded = false;
+    protected void initialDownload() {
+        Main.worker.execute(new Runnable() {
+            public void run() {
+                osbPlugin.updateData();
+            }
+        });
+    }
+    
+	@Override
+	public void showDialog() {
+		if (!downloaded) {
+			initialDownload();
+			downloaded = true;
+		}
+		super.showDialog();
+	}
 }