diff --git a/src/Gui/EditingContext.cpp b/src/Gui/EditingContext.cpp
index 2ee94e2f13..a64726c9e3 100644
--- a/src/Gui/EditingContext.cpp
+++ b/src/Gui/EditingContext.cpp
@@ -124,6 +124,10 @@ EditingContextResolver::EditingContextResolver()
     app.signalActivatedViewProvider.connect(
         [this](const ViewProviderDocumentObject*, const char*) { refresh(); }
     );
+
+    // Resolve the initial context so currentContext() returns a valid state
+    // before any signals fire (e.g. when BreadcrumbToolBar queries on creation).
+    refresh();
 }
 
 EditingContextResolver::~EditingContextResolver()