Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 3077)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 3078)
@@ -111,4 +111,19 @@
     }
 
+    /**
+     * Adds a edit layer change listener
+     *
+     * @param listener the listener. Ignored if null or already registered.
+     * @param initialFire Fire an edit-layer-changed-event right after adding the listener.
+     */
+    public static void addEditLayerChangeListener(EditLayerChangeListener listener, boolean initialFire) {
+        addEditLayerChangeListener(listener);
+        if (initialFire) {
+            if (Main.map != null && Main.map.mapView != null && Main.map.mapView.getEditLayer() != null) {
+                fireEditLayerChanged(null, Main.map.mapView.getEditLayer());
+            }
+        }
+    }
+
     public static void addEditLayerChangeListener(EditLayerChangeListener listener) {
         if (listener != null) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 3077)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 3078)
@@ -122,5 +122,5 @@
     public void showNotify() {
         DataSet.selListeners.add(this);
-        MapView.addEditLayerChangeListener(this);
+        MapView.addEditLayerChangeListener(this, true);
         refreshView();
     }
@@ -151,5 +151,4 @@
         lstConflicts.setSelectedIndex(index);
 
-        refreshView();
         Main.map.mapView.repaint();
     }
Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 3077)
+++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 3078)
@@ -389,4 +389,6 @@
                     ht("/Concepts/Conflict#WarningAboutDetectedConflicts")
             );
+            Main.map.conflictDialog.unfurlDialog();
+            Main.map.repaint();
         }
     }