diff --git a/src/plugins/coreplugin/find/searchresulttreemodel.cpp b/src/plugins/coreplugin/find/searchresulttreemodel.cpp
index b602e1b020f..a06afb45131 100644
--- a/src/plugins/coreplugin/find/searchresulttreemodel.cpp
+++ b/src/plugins/coreplugin/find/searchresulttreemodel.cpp
@@ -209,7 +209,7 @@ QVariant SearchResultTreeModel::data(const QModelIndex &idx, int role) const
     QVariant result;
 
     if (role == Qt::SizeHintRole) {
-        int height = QApplication::fontMetrics().height();
+        int height = QFontMetrics(QApplication::font()).height();
         if (m_editorFontIsUsed) {
             const int editorFontHeight = QFontMetrics(m_textEditorFont).height();
             height = qMax(height, editorFontHeight);
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 7a51c633782..a6c0be17172 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -302,7 +302,8 @@ void ManhattanStyle::polish(QWidget *widget)
 
         widget->setAttribute(Qt::WA_LayoutUsesWidgetRect, true);
         // So that text isn't cutoff in line-edits, comboboxes... etc.
-        const int height = qMax(StyleHelper::navigationWidgetHeight(), QApplication::fontMetrics().height());
+        const int height = qMax(StyleHelper::navigationWidgetHeight(),
+                                QFontMetrics(QApplication::font()).height());
         if (qobject_cast<QToolButton*>(widget)) {
             widget->setMinimumWidth(
                 StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyleCompact ? 24 : 28);