diff --git a/src/plugins/projectexplorer/windebuginterface.cpp b/src/plugins/projectexplorer/windebuginterface.cpp
index b9247a71a5e..3fc4c2d8aef 100644
--- a/src/plugins/projectexplorer/windebuginterface.cpp
+++ b/src/plugins/projectexplorer/windebuginterface.cpp
@@ -50,6 +50,12 @@ WinDebugInterface::WinDebugInterface(QObject *parent) :
     start();
 }
 
+WinDebugInterface::~WinDebugInterface()
+{
+    terminate(); // Creator is shutting down anyway, no need to clean up.
+    wait(500);
+}
+
 void WinDebugInterface::run()
 {
     HANDLE bufferReadyEvent = CreateEvent(NULL, FALSE, FALSE, L"DBWIN_BUFFER_READY");
diff --git a/src/plugins/projectexplorer/windebuginterface.h b/src/plugins/projectexplorer/windebuginterface.h
index f652b2e9526..a51d0a4f84f 100644
--- a/src/plugins/projectexplorer/windebuginterface.h
+++ b/src/plugins/projectexplorer/windebuginterface.h
@@ -46,6 +46,8 @@ class WinDebugInterface : public QThread
 
 public:
     explicit WinDebugInterface(QObject *parent = 0);
+    ~WinDebugInterface();
+
     static WinDebugInterface *instance();
 
 signals: