diff --git a/lib/macro/macro.cpp b/lib/macro/macro.cpp
index 6de3fda7..faf16b5c 100644
--- a/lib/macro/macro.cpp
+++ b/lib/macro/macro.cpp
@@ -314,7 +314,9 @@ bool Macro::CheckConditions(bool ignorePause)
 
 bool Macro::PerformActions(bool match, bool forceParallel, bool ignorePause)
 {
-	if (!_done) {
+	if (_actionRunFuture.valid() &&
+	    _actionRunFuture.wait_for(std::chrono::seconds(0)) !=
+		    std::future_status::ready) {
 		vblog(LOG_INFO, "Macro %s already running", _name.c_str());
 
 		if (!_stopActionsIfNotDone) {
@@ -332,14 +334,15 @@ bool Macro::PerformActions(bool match, bool forceParallel, bool ignorePause)
 		      : std::bind(&Macro::RunElseActions, this,
 				  std::placeholders::_1);
 	_stop = false;
-	_done = false;
 	bool ret = true;
 	if (_runInParallel || forceParallel) {
-		if (_backgroundThread.joinable()) {
-			_backgroundThread.join();
+		if (_actionRunFuture.valid()) {
+			_actionRunFuture.get();
 		}
-		_backgroundThread = std::thread(
-			[this, runFunc, ignorePause] { runFunc(ignorePause); });
+		_actionRunFuture = std::async(std::launch::async,
+					      [this, runFunc, ignorePause] {
+						      runFunc(ignorePause);
+					      });
 	} else {
 		ret = runFunc(ignorePause);
 	}
@@ -456,7 +459,6 @@ bool Macro::RunActionsHelper(
 			action->EnableHighlight();
 		}
 	}
-	_done = true;
 	return actionsExecutedSuccessfully;
 }
 
@@ -556,8 +558,8 @@ void Macro::Stop()
 			t.join();
 		}
 	}
-	if (_backgroundThread.joinable()) {
-		_backgroundThread.join();
+	if (_actionRunFuture.valid()) {
+		_actionRunFuture.get();
 	}
 	if (_conditionCheckFuture.valid()) {
 		_conditionCheckFuture.get();
@@ -572,10 +574,13 @@ void Macro::SetCheckInParallel(bool parallel)
 
 bool Macro::ParallelTasksCompleted() const
 {
-	if (!CheckInParallel() && !RunInParallel()) {
+	// A parallel action run might be triggered by RunInParallel() or the
+	// "Run Macro" button, so checking just for RunInParallel() will not
+	// suffice
+	if (!CheckInParallel() && !_actionRunFuture.valid()) {
 		return true;
 	}
-	if (RunInParallel() && !_done) {
+	if (_actionRunFuture.valid()) {
 		return false;
 	}
 	if (CheckInParallel() && _conditionCheckFuture.valid()) {
diff --git a/lib/macro/macro.hpp b/lib/macro/macro.hpp
index ba743237..c5e1c22d 100644
--- a/lib/macro/macro.hpp
+++ b/lib/macro/macro.hpp
@@ -187,11 +187,10 @@ private:
 	std::string _name = "";
 	bool _die = false;
 	bool _stop = false;
-	bool _done = true;
+	std::future<void> _actionRunFuture;
 	TimePoint _lastCheckTime{};
 	TimePoint _lastUnpauseTime{};
 	TimePoint _lastExecutionTime{};
-	std::thread _backgroundThread;
 	std::vector<std::thread> _helperThreads;
 
 	std::deque<std::shared_ptr<MacroCondition>> _conditions;