diff --git a/app/actions/actions-types.h b/app/actions/actions-types.h
index cd86f96..0c30322 100644
--- a/app/actions/actions-types.h
+++ b/app/actions/actions-types.h
@@ -46,7 +46,8 @@ typedef enum
   GIMP_SAVE_MODE_SAVE_A_COPY,
   GIMP_SAVE_MODE_SAVE_AND_CLOSE,
   GIMP_SAVE_MODE_EXPORT,
-  GIMP_SAVE_MODE_EXPORT_TO /* Also used for 'Overwrite' */
+  GIMP_SAVE_MODE_EXPORT_TO,
+  GIMP_SAVE_MODE_OVERWRITE
 } GimpSaveMode;
 
 
diff --git a/app/actions/file-actions.c b/app/actions/file-actions.c
index c3fa676..4b03424 100644
--- a/app/actions/file-actions.c
+++ b/app/actions/file-actions.c
@@ -151,7 +151,7 @@ static const GimpEnumActionEntry file_save_actions[] =
   { "file-overwrite", NULL,
     NC_("file-action", "Overwrite"), "",
     NC_("file-action", "Export the image back to the imported file in the import format"),
-    GIMP_SAVE_MODE_EXPORT_TO, FALSE,
+    GIMP_SAVE_MODE_OVERWRITE, FALSE,
     GIMP_HELP_FILE_OVERWRITE },
 
   { "file-export", NULL,
diff --git a/app/actions/file-commands.c b/app/actions/file-commands.c
index 2395e2e..b5cf2a4 100644
--- a/app/actions/file-commands.c
+++ b/app/actions/file-commands.c
@@ -283,6 +283,7 @@ file_save_cmd_callback (GtkAction *action,
       file_export_dialog_show (gimp, image, widget);
       break;
 
+    case GIMP_SAVE_MODE_OVERWRITE:
     case GIMP_SAVE_MODE_EXPORT_TO:
       {
         const gchar         *uri;
@@ -290,7 +291,7 @@ file_save_cmd_callback (GtkAction *action,
 
         uri = gimp_image_get_exported_uri (image);
 
-        if (!uri)
+        if (!uri || save_mode == GIMP_SAVE_MODE_OVERWRITE)
           uri = gimp_image_get_imported_uri (image);
 
         if (uri)
