diff --git a/Greenshot/Helpers/DestinationHelper.cs b/Greenshot/Helpers/DestinationHelper.cs
index d14bb5d07..1e64af517 100644
--- a/Greenshot/Helpers/DestinationHelper.cs
+++ b/Greenshot/Helpers/DestinationHelper.cs
@@ -23,6 +23,7 @@ using System.Collections.Generic;
 
 using Greenshot.Plugin;
 using GreenshotPlugin.Core;
+using Greenshot.Destinations;
 
 namespace Greenshot.Helpers {
 	/// <summary>
@@ -117,8 +118,10 @@ namespace Greenshot.Helpers {
 				IDestination destination = RegisteredDestinations[designation];
 				if (destination.isActive) {
 					if (destination.ExportCapture(manuallyInitiated, surface, captureDetails)) {
-						// Export worked, set the modified flag
-						surface.Modified = false;
+						// Export worked, set the modified flag to false if the export wasn't to the editor or picker
+						if (!EditorDestination.DESIGNATION.Equals(designation) && !PickerDestination.DESIGNATION.Equals(designation)) {
+							surface.Modified = false;
+						}
 					}
 				}
 			}