diff --git a/Greenshot/Destinations/FileDestination.cs b/Greenshot/Destinations/FileDestination.cs
index 819fca500..8b05a92d9 100644
--- a/Greenshot/Destinations/FileDestination.cs
+++ b/Greenshot/Destinations/FileDestination.cs
@@ -125,6 +125,7 @@ namespace Greenshot.Destinations {
 				exportInformation.ExportMade = outputMade;
 				exportInformation.Filepath = fullPath;
 				captureDetails.Filename = fullPath;
+				conf.OutputFileAsFullpath = fullPath;
 			}
 
 			ProcessExport(exportInformation, surface);
diff --git a/Greenshot/Destinations/FileWithDialogDestination.cs b/Greenshot/Destinations/FileWithDialogDestination.cs
index 9f0fd1682..c21495c1c 100644
--- a/Greenshot/Destinations/FileWithDialogDestination.cs
+++ b/Greenshot/Destinations/FileWithDialogDestination.cs
@@ -78,6 +78,7 @@ namespace Greenshot.Destinations {
 				exportInformation.ExportMade = true;
 				exportInformation.Filepath = savedTo;
 				captureDetails.Filename = savedTo;
+				conf.OutputFileAsFullpath = savedTo;
 			}
 			ProcessExport(exportInformation, surface);
 			return exportInformation;
diff --git a/GreenshotPlugin/Core/ImageOutput.cs b/GreenshotPlugin/Core/ImageOutput.cs
index 2fa7a4808..7ed169c02 100644
--- a/GreenshotPlugin/Core/ImageOutput.cs
+++ b/GreenshotPlugin/Core/ImageOutput.cs
@@ -418,7 +418,6 @@ namespace GreenshotPlugin.Core {
 					// TODO: For now we always overwrite, should be changed
 					ImageOutput.Save(surface, fileNameWithExtension, true, outputSettings, conf.OutputFileCopyPathToClipboard);
 					returnValue = fileNameWithExtension;
-					conf.OutputFileAsFullpath = fileNameWithExtension;
 					IniConfig.Save();
 				} catch (System.Runtime.InteropServices.ExternalException) {
 					MessageBox.Show(Language.GetFormattedString("error_nowriteaccess", saveImageFileDialog.FileName).Replace(@"\\", @"\"), Language.GetString("error"));