diff --git a/Greenshot/Forms/MainForm.cs b/Greenshot/Forms/MainForm.cs
index a89f3f159..e95d94094 100644
--- a/Greenshot/Forms/MainForm.cs
+++ b/Greenshot/Forms/MainForm.cs
@@ -1249,13 +1249,18 @@ namespace Greenshot {
 			switch (clickAction) {
 				case ClickActions.OPEN_LAST_IN_EXPLORER:
 					string path = null;
-					string configPath = FilenameHelper.FillVariables(_conf.OutputFilePath, false);
-					string lastFilePath = Path.GetDirectoryName(_conf.OutputFileAsFullpath);
-					if (lastFilePath != null && Directory.Exists(lastFilePath)) {
-						path = lastFilePath;
-					} else if (Directory.Exists(configPath)) {
-						path = configPath;
-					}
+                    if (!string.IsNullOrEmpty(_conf.OutputFileAsFullpath)) {
+                        string lastFilePath = Path.GetDirectoryName(_conf.OutputFileAsFullpath);
+                        if (!string.IsNullOrEmpty(lastFilePath) && Directory.Exists(lastFilePath)) {
+                            path = lastFilePath;
+					    }
+                    }
+                    if (path == null) {
+                        string configPath = FilenameHelper.FillVariables(_conf.OutputFilePath, false);
+                        if (Directory.Exists(configPath)) {
+                            path = configPath;
+                        }
+                    }
 
 					if (path != null) {
 						try {
diff --git a/Greenshot/releases/additional_files/readme.txt.template b/Greenshot/releases/additional_files/readme.txt.template
index b95595c55..ace648982 100644
--- a/Greenshot/releases/additional_files/readme.txt.template
+++ b/Greenshot/releases/additional_files/readme.txt.template
@@ -23,6 +23,7 @@ Bugs resolved:
 * BUG-1610: Image editor: 'Obfuscate' and 'Highlight' and more, now should rotate / resize correctly.
 * BUG-1619: Image editor: Autocrop now also considers the elements.
 * BUG-1653: Accessibility issues: Editor "File" menu entry can't be activated and missing translations
+* BUG-1671: Fixed error that occurred when double-clicking systray icon before the first time a screenshot was saved to file
 
 Changes:
 * Dynamic destination context-menu: If a destination has child items the parent is still selectable and executes the default export, we now no longer repeat the parent in the children.