diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index fc0fed11d60..61215190283 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -1091,13 +1091,15 @@ void StringAspect::addToLayout(LayoutBuilder &builder)
         useMacroExpander(d->m_pathChooserDisplay->lineEdit());
         if (isAutoApply()) {
             if (d->m_autoApplyOnEditingFinished) {
-                connect(d->m_pathChooserDisplay, &PathChooser::editingFinished, this, [this] {
+                const auto setPathChooserValue = [this] {
                     if (d->m_blockAutoApply)
                         return;
                     d->m_blockAutoApply = true;
                     setValue(d->m_pathChooserDisplay->filePath().toString());
                     d->m_blockAutoApply = false;
-                });
+                };
+                connect(d->m_pathChooserDisplay, &PathChooser::editingFinished, this, setPathChooserValue);
+                connect(d->m_pathChooserDisplay, &PathChooser::browsingFinished, this, setPathChooserValue);
             } else {
                 connect(d->m_pathChooserDisplay, &PathChooser::pathChanged,
                         this, [this](const QString &path) {
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index d4a4cdbe6f5..bf182d80b8a 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -409,7 +409,7 @@ int ManhattanStyle::styleHint(StyleHint hint, const QStyleOption *option, const
             ret = QFormLayout::AllNonFixedFieldsGrow;
         break;
     case QStyle::SH_Widget_Animation_Duration:
-        if (widget->inherits("QTreeView"))
+        if (widget && widget->inherits("QTreeView"))
             ret = 0;
         break;
     default: