diff --git a/Greenshot/Helpers/CaptureHelper.cs b/Greenshot/Helpers/CaptureHelper.cs
index c741b355f..6e42a908d 100644
--- a/Greenshot/Helpers/CaptureHelper.cs
+++ b/Greenshot/Helpers/CaptureHelper.cs
@@ -188,6 +188,9 @@ namespace Greenshot.Helpers {
 					break;
 				case CaptureMode.ActiveWindow:
 					if (CaptureActiveWindow()) {
+						if (windowDetailsThread != null) {
+							windowDetailsThread.Join();
+						}
 						// Capture worked, offset mouse according to screen bounds and capture location
 						capture.MoveMouseLocation(capture.ScreenBounds.Location.X-capture.Location.X, capture.ScreenBounds.Location.Y-capture.Location.Y);
 						capture.MoveElements(capture.ScreenBounds.Location.X-capture.Location.X, capture.ScreenBounds.Location.Y-capture.Location.Y);