diff --git a/src/plugins/coreplugin/helpitem.cpp b/src/plugins/coreplugin/helpitem.cpp
index 50f84bbf7ab..c2cb6ac54ef 100644
--- a/src/plugins/coreplugin/helpitem.cpp
+++ b/src/plugins/coreplugin/helpitem.cpp
@@ -298,7 +298,8 @@ static const HelpItem::Links getBestLink(const HelpItem::Links &links)
     // documentation, that we only return the Qt5 link even though the Qt5 and Qt4 URLs look
     // different.
     QVersionNumber highestVersion;
-    HelpItem::Link bestLink;
+    // Default to first link if version extraction failed, possibly because it is not a Qt doc link
+    HelpItem::Link bestLink = links.front();
     for (const HelpItem::Link &link : links) {
         const QVersionNumber version = extractVersion(link.second).second;
         if (version > highestVersion) {
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
index e936a419b47..03386b38f1a 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
@@ -316,7 +316,12 @@ QList<ModelNode> filteredList(const NodeListProperty &property, bool filter, boo
 
     if (filter) {
         list.append(Utils::filtered(property.toModelNodeList(), [] (const ModelNode &arg) {
-            return QmlItemNode::isValidQmlItemNode(arg) || NodeHints::fromModelNode(arg).visibleInNavigator();
+            const char auxProp[] = "showInNavigator@Internal";
+            if (arg.hasAuxiliaryData(auxProp))
+                return arg.auxiliaryData(auxProp).toBool();
+            const bool value = QmlItemNode::isValidQmlItemNode(arg) || NodeHints::fromModelNode(arg).visibleInNavigator();
+            arg.setAuxiliaryData(auxProp, value);
+            return value;
         }));
     } else {
         list = property.toModelNodeList();