diff --git a/src/main/java/net/preibisch/mvrecon/fiji/spimdata/XmlIoSpimData2.java b/src/main/java/net/preibisch/mvrecon/fiji/spimdata/XmlIoSpimData2.java
index e047c7aa..f873c05e 100644
--- a/src/main/java/net/preibisch/mvrecon/fiji/spimdata/XmlIoSpimData2.java
+++ b/src/main/java/net/preibisch/mvrecon/fiji/spimdata/XmlIoSpimData2.java
@@ -244,6 +244,12 @@ public SpimData2 fromXml( final Element root, final URI xmlFile ) throws SpimDat
 
 	@Override
 	public Element toXml( final SpimData2 spimData, final File xmlFileDirectory ) throws SpimDataException
+	{
+		return toXml(spimData, xmlFileDirectory.toURI() );
+	}
+
+	@Override
+	public Element toXml( final SpimData2 spimData, final URI xmlFileDirectory ) throws SpimDataException
 	{
 		final Element root = super.toXml( spimData, xmlFileDirectory );
 
diff --git a/src/main/java/net/preibisch/mvrecon/fiji/spimdata/explorer/FilteredAndGroupedExplorerPanel.java b/src/main/java/net/preibisch/mvrecon/fiji/spimdata/explorer/FilteredAndGroupedExplorerPanel.java
index a13fbf76..28510e9e 100644
--- a/src/main/java/net/preibisch/mvrecon/fiji/spimdata/explorer/FilteredAndGroupedExplorerPanel.java
+++ b/src/main/java/net/preibisch/mvrecon/fiji/spimdata/explorer/FilteredAndGroupedExplorerPanel.java
@@ -69,6 +69,7 @@
 import net.preibisch.mvrecon.fiji.spimdata.explorer.popup.BDVPopup;
 import net.preibisch.mvrecon.fiji.spimdata.explorer.popup.ExplorerWindowSetable;
 import net.preibisch.mvrecon.process.interestpointregistration.TransformationTools;
+import util.URITools;
 
 public abstract class FilteredAndGroupedExplorerPanel< AS extends SpimData2 >
 		extends JPanel implements ExplorerWindow< AS >, GroupedRowWindow
@@ -502,7 +503,7 @@ public JPopupMenu addRightClickSaveAs()
 		{
 			final SpimData2 data = this.getSpimData();
 
-			final URI newXMLPath = XMLSaveAs.saveAs( data, this.xml().toString() );
+			final URI newXMLPath = XMLSaveAs.saveAs( data, URITools.getFileName( this.xml() ) );
 
 			if ( newXMLPath != null )
 			{