diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index 3009506d47e97261c57b07ac343e15718ab4e37b..486b3567719bfd73674a9af8fdd192b9e14045b2 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -826,7 +826,8 @@ void LldbEngine::readLldbStandardError()
 void LldbEngine::readLldbStandardOutput()
 {
     QByteArray out = m_lldbProc.readAllStandardOutput();
-    showMessage(_("Lldb stdout: " + out));
+    //showMessage(_("Lldb stdout: " + out));
+    showMessage(_(out), LogDebug);
     m_inbuffer.append(out);
     while (true) {
         int pos = m_inbuffer.indexOf("@\n");
diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp
index 5177150b4dae42fb5ea3e4db5baca0d809a926ce..f54f1c5611d125f0188936e2aea6b5b8c4363c65 100644
--- a/src/plugins/debugger/logwindow.cpp
+++ b/src/plugins/debugger/logwindow.cpp
@@ -306,13 +306,18 @@ public slots:
     {
         QString needle = QString::number(i) + QLatin1Char('^');
         QString needle2 = QLatin1Char('>') + needle;
+        QString needle3 = QString::fromLatin1("dtoken(\"%1\")@").arg(i);
         QTextCursor cursor(document());
         do {
-            cursor = document()->find(needle, cursor);
-            if (cursor.isNull())
-                break; // Not found.
+            QTextCursor newCursor = document()->find(needle, cursor);
+            if (newCursor.isNull()) {
+                newCursor = document()->find(needle3, cursor);
+                if (newCursor.isNull())
+                    break; // Not found.
+            }
+            cursor = newCursor;
             const QString line = cursor.block().text();
-            if (line.startsWith(needle) || line.startsWith(needle2)) {
+            if (line.startsWith(needle) || line.startsWith(needle2) || line.startsWith(needle3)) {
                 setFocus();
                 setTextCursor(cursor);
                 ensureCursorVisible();