Index: RelationEditor.java
===================================================================
--- RelationEditor.java	(revision 1147)
+++ RelationEditor.java	(working copy)
@@ -555,6 +555,7 @@
 
 					if (visitor.conflicts.isEmpty())
 						return;
+					try { setAlwaysOnTop(true); } catch (SecurityException sx) {}
 					final ConflictDialog dlg = Main.map.conflictDialog;
 					dlg.add(visitor.conflicts);
 					JOptionPane.showMessageDialog(Main.parent,
@@ -562,6 +563,7 @@
 					if (!dlg.isVisible())
 						dlg.action
 								.actionPerformed(new ActionEvent(this, 0, ""));
+					try { setAlwaysOnTop(false); } catch (SecurityException sx) {}
 				}
 
 			} catch (SAXException e) {