diff --git a/src/Gui/Notifications.h b/src/Gui/Notifications.h
index b5fed13ead..a46452b4c1 100644
--- a/src/Gui/Notifications.h
+++ b/src/Gui/Notifications.h
@@ -166,6 +166,21 @@ inline void Gui::Notify(TNotifier && notifier, TCaption && caption, TMessage &&
                                      Base::IntendedRecipient::Developer,
                                      Base::ContentType::Untranslated>(notifier->getFullLabel(), msg.c_str());
             }
+            else if constexpr( std::is_base_of_v<Gui::ViewProviderDocumentObject, std::remove_pointer_t<typename std::decay<TNotifier>::type>> ) {
+                Base::Console().Send<type,
+                                     Base::IntendedRecipient::Developer,
+                                     Base::ContentType::Untranslated>(notifier->getObject()->getFullLabel(), msg.c_str());
+            }
+            else if constexpr( std::is_base_of_v<Gui::Document, std::remove_pointer_t<typename std::decay<TNotifier>::type>> ) {
+                Base::Console().Send<type,
+                                     Base::IntendedRecipient::Developer,
+                                     Base::ContentType::Untranslated>(notifier->getDocument()->Label.getStrValue(), msg.c_str());
+            }
+            else if constexpr( std::is_base_of_v<App::Document, std::remove_pointer_t<typename std::decay<TNotifier>::type>> ) {
+                Base::Console().Send<type,
+                                     Base::IntendedRecipient::Developer,
+                                     Base::ContentType::Untranslated>(notifier->Label.getStrValue(), msg.c_str());
+            }
             else {
                 Base::Console().Send<type,
                                      Base::IntendedRecipient::Developer,
@@ -219,6 +234,15 @@ inline void Gui::Notify(TNotifier && notifier, TCaption && caption, TMessage &&
             if constexpr( std::is_base_of_v<App::DocumentObject, std::remove_pointer_t<typename std::decay<TNotifier>::type>> ) {
                 Base::Console().Send<type, recipient, content>(notifier->getFullLabel(), msg.toUtf8());
             }
+            else if constexpr( std::is_base_of_v<Gui::ViewProviderDocumentObject, std::remove_pointer_t<typename std::decay<TNotifier>::type>> ) {
+                Base::Console().Send<type, recipient, content>(notifier->getObject()->getFullLabel(), msg.toUtf8());
+            }
+            else if constexpr( std::is_base_of_v<Gui::Document, std::remove_pointer_t<typename std::decay<TNotifier>::type>> ) {
+                Base::Console().Send<type, recipient, content>(notifier->getDocument()->Label.getStrValue(), msg.toUtf8());
+            }
+            else if constexpr( std::is_base_of_v<App::Document, std::remove_pointer_t<typename std::decay<TNotifier>::type>> ) {
+                Base::Console().Send<type, recipient, content>(notifier->Label.getStrValue(), msg.toUtf8());
+            }
             else {
                 Base::Console().Send<type, recipient, content>(notifier, msg.toUtf8());
             }
@@ -230,6 +254,15 @@ inline void Gui::Notify(TNotifier && notifier, TCaption && caption, TMessage &&
             if constexpr( std::is_base_of_v<App::DocumentObject, std::remove_pointer_t<typename std::decay<TNotifier>::type>> ) {
                 Base::Console().Send<type, recipient, content>(notifier->getFullLabel(), msg.c_str());
             }
+            else if constexpr( std::is_base_of_v<Gui::ViewProviderDocumentObject, std::remove_pointer_t<typename std::decay<TNotifier>::type>> ) {
+                Base::Console().Send<type, recipient, content>(notifier->getObject()->getFullLabel(), msg.c_str());
+            }
+            else if constexpr( std::is_base_of_v<Gui::Document, std::remove_pointer_t<typename std::decay<TNotifier>::type>> ) {
+                Base::Console().Send<type, recipient, content>(notifier->getDocument()->Label.getStrValue(), msg.c_str());
+            }
+            else if constexpr( std::is_base_of_v<App::Document, std::remove_pointer_t<typename std::decay<TNotifier>::type>> ) {
+                Base::Console().Send<type, recipient, content>(notifier->Label.getStrValue(), msg.c_str());
+            }
             else {
                 Base::Console().Send<type, recipient, content>(notifier, msg.c_str());
             }