diff --git a/source/ide/wiki/wiki_methods.bas b/source/ide/wiki/wiki_methods.bas
index 650d8aee7..07117c116 100644
--- a/source/ide/wiki/wiki_methods.bas
+++ b/source/ide/wiki/wiki_methods.bas
@@ -7,7 +7,7 @@ FUNCTION Back2BackName$ (a$)
 END FUNCTION
 
 FUNCTION Wiki$ (PageName$) 'Read cached wiki page (download, if not yet cached)
-    Help_PageLoaded$ = PageName$
+    IF LEFT$(PageName$, 9) <> "Template:" THEN Help_PageLoaded$ = PageName$
 
     'Escape all invalid and other critical chars in filenames
     PageName2$ = ""
@@ -702,6 +702,15 @@ SUB WikiParse (a$) 'Wiki page interpret
                     Help_Bold = 0: Help_Italic = 0: col = Help_Col
                 END IF
 
+                'Template wrapped plugin
+                IF RIGHT$(cb$, 6) = "Plugin" AND Help_LockParse = 0 THEN 'no plugins in blocks
+                    pit$ = Wiki$("Template:" + cb$)
+                    IF INSTR(pit$, "{{PageInternalError}}") = 0 THEN
+                        a$ = LEFT$(a$, i) + pit$ + RIGHT$(a$, LEN(a$) - i)
+                        n = n + LEN(pit$)
+                    END IF
+                END IF
+
                 'Template wrapped table
                 IF RIGHT$(cb$, 5) = "Table" AND Help_LockParse = 0 THEN 'no table info in blocks
                     Help_LinkN = Help_LinkN + 1