diff --git a/extras/Projucer/Source/ComponentEditor/Components/jucer_ComponentTypeHandler.h b/extras/Projucer/Source/ComponentEditor/Components/jucer_ComponentTypeHandler.h
index ffd39ad387..ca295ae909 100644
--- a/extras/Projucer/Source/ComponentEditor/Components/jucer_ComponentTypeHandler.h
+++ b/extras/Projucer/Source/ComponentEditor/Components/jucer_ComponentTypeHandler.h
@@ -52,7 +52,13 @@ public:
     static ComponentTypeHandler* getHandlerFor (Component& component);
 
     //==============================================================================
-    virtual String getXmlTagName() const noexcept             { return className.toUpperCase(); }
+    virtual String getXmlTagName() const noexcept
+    {
+        if (className.startsWith ("juce::"))
+            return className.substring (6).toUpperCase();
+
+        return className.toUpperCase();
+    }
 
     static ComponentTypeHandler* getHandlerForXmlTag (const String& tagName);
 
diff --git a/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp b/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp
index 5193f61fdf..47357bf520 100644
--- a/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp
+++ b/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp
@@ -311,7 +311,8 @@ void JucerDocument::setOptionalMethodEnabled (const String& methodSignature, con
 
 bool JucerDocument::isOptionalMethodEnabled (const String& sig) const noexcept
 {
-    return activeExtraMethods.contains (sig);
+    return activeExtraMethods.contains (sig)
+          || activeExtraMethods.contains (sig.replace ("juce::", {}));
 }
 
 void JucerDocument::addExtraClassProperties (PropertyPanel&)