diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3329446..fc494551 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - fixed issue with default box not being detected on start [#2195](https://github.com/sandboxie-plus/Sandboxie/issues/2195)
 - fixed move sandbox menu issue [2225](https://github.com/sandboxie-plus/Sandboxie/issues/2225) (thanks okrc)
 - fixed issues with stale data in sandboxie ini [#2234](https://github.com/sandboxie-plus/Sandboxie/pull/2234) (thanks okrc)
+- fixed autostart issue [#2219](https://github.com/sandboxie-plus/Sandboxie/issues/2219)
 
 ### Removed
 - removed obsolete VPNTunnel template
diff --git a/SandboxiePlus/SandMan/main.cpp b/SandboxiePlus/SandMan/main.cpp
index 1c70c5d2..1b2584db 100644
--- a/SandboxiePlus/SandMan/main.cpp
+++ b/SandboxiePlus/SandMan/main.cpp
@@ -126,8 +126,12 @@ int main(int argc, char *argv[])
 			return 0;
 		app.disableSingleApp(); // we start to do one job and exit, don't interfear with starting a regular instance
 	}
-	else if (app.sendMessage("ShowWnd"))
-		return 0;
+	else {
+		if (app.arguments().contains("-autorun") && app.isRunning())
+			return 0;
+		if (app.sendMessage("ShowWnd"))
+			return 0;
+	}
 
 	//QThreadPool::globalInstance()->setMaxThreadCount(theConf->GetInt("Options/MaxThreadPool", 10));