diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 9b8485aa4856ad2d78c9b7a0d2b44e33ead7ec05..1e41f08c0bc1d81f83ac0f02b37bcc3cfcb358b9 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -33,6 +33,7 @@
 #include "debuggerplugin.h"
 #include "debuggerdialogs.h"
 #include "debuggerstringutils.h"
+#include "debuggeruiswitcher.h"
 
 #include "breakhandler.h"
 #include "moduleshandler.h"
@@ -73,10 +74,6 @@
 #endif
 # define XSDEBUG(s) qDebug() << s
 
-#define CB(callback) &QmlEngine::callback, STRINGIFY(callback)
-
-//#define USE_CONGESTION_CONTROL
-
 
 namespace Debugger {
 namespace Internal {
@@ -655,6 +652,11 @@ void QmlEngine::messageReceived(const QByteArray &message)
         else
             watchHandler()->endCycle();
 
+        //ensure we got the right ui right now
+        Debugger::DebuggerUISwitcher *uiSwitcher = Debugger::DebuggerUISwitcher::instance();
+        uiSwitcher->setActiveLanguage("C++");
+
+
     } else if (command == "RESULT") {
         WatchData data;
         QByteArray iname;