diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
index 0522fefa2f0..fdb36c7ec98 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
+++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
@@ -97,6 +97,12 @@ static QString createDiagnosticToolTipString(const Diagnostic &diagnostic)
                      diagnostic.type.toHtmlEscaped());
     }
 
+    if (!diagnostic.description.isEmpty()) {
+        lines << qMakePair(
+                     QCoreApplication::translate("ClangTools::Diagnostic", "Description:"),
+                     diagnostic.description.toHtmlEscaped());
+    }
+
     if (!diagnostic.issueContext.isEmpty() && !diagnostic.issueContextKind.isEmpty()) {
         lines << qMakePair(
                      QCoreApplication::translate("ClangTools::Diagnostic", "Context:"),
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticview.cpp b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
index e03184d4fc4..67d20c9671a 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
+++ b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
@@ -34,6 +34,7 @@
 
 #include <QAction>
 #include <QDebug>
+#include <QHeaderView>
 
 using namespace Debugger;
 
@@ -103,5 +104,12 @@ bool DiagnosticView::eventFilter(QObject *watched, QEvent *event)
     }
 }
 
+void DiagnosticView::setModel(QAbstractItemModel *model)
+{
+    Debugger::DetailedErrorView::setModel(model);
+    header()->setStretchLastSection(false);
+    header()->setSectionResizeMode(0, QHeaderView::Stretch);
+}
+
 } // namespace Internal
 } // namespace ClangTools
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticview.h b/src/plugins/clangtools/clangtoolsdiagnosticview.h
index 69d83416b59..0947d179518 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticview.h
+++ b/src/plugins/clangtools/clangtoolsdiagnosticview.h
@@ -46,6 +46,7 @@ private:
 
     QList<QAction *> customActions() const;
     bool eventFilter(QObject *watched, QEvent *event) override;
+    void setModel(QAbstractItemModel *model) override;
 
     QAction *m_suppressAction;
 };