diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 846fcc136..b7b5fafd9 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,6 @@
 2006-08-26  Don Allingham  <don@gramps-project.org>
+	* src/Editors/_EditMedia.py (EditMedia.save): don't set path on
+	a save
 	* src/Config/_GrampsConfigKeys.py: set toolbar-on to 1 if the gconf
 	schemas were not installed properly
 
diff --git a/gramps2/src/Editors/_EditMedia.py b/gramps2/src/Editors/_EditMedia.py
index 775c539a4..3d20f36ac 100644
--- a/gramps2/src/Editors/_EditMedia.py
+++ b/gramps2/src/Editors/_EditMedia.py
@@ -198,7 +198,9 @@ class EditMedia(EditPrimary):
         if path != self.obj.get_path():
             mime = Mime.get_type(os.path.abspath(path))
             self.obj.set_mime_type(mime)
-        self.obj.set_path(path)
+
+        if self.obj.get_mime_type():
+            self.obj.set_path(path)
 
         trans = self.db.transaction_begin()
         self.db.commit_media_object(self.obj,trans)