diff --git a/admin/template/goto/popuphelp.tpl b/admin/template/goto/popuphelp.tpl
new file mode 100644
index 000000000..950e3ca0e
--- /dev/null
+++ b/admin/template/goto/popuphelp.tpl
@@ -0,0 +1,12 @@
+<div id="content" class="content">
+{$HELP_CONTENT}
+</div> <!-- content -->
+
+<ul class="categoryActions">
+  <li>
+    <a href="#" onclick="window.close();" title="{'Close this window'|@translate}">
+      <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/exit.png" class="button" alt="exit">
+    </a>
+  </li>
+</ul>
+
diff --git a/include/common.inc.php b/include/common.inc.php
index 9575338a5..7b892cbbc 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -168,7 +168,8 @@ if (is_a_guest())
 }
 
 // template instance
-if ( defined('IN_ADMIN') and IN_ADMIN )
+if (( defined('IN_ADMIN') and IN_ADMIN )
+    or (defined('PWG_HELP') and PWG_HELP))
 {// Admin template
   list($user['admin_template'], $user['admin_theme']) =
     explode ('/', $conf['admin_layout']);
diff --git a/popuphelp.php b/popuphelp.php
index 1f2a8ec44..4cb68327d 100644
--- a/popuphelp.php
+++ b/popuphelp.php
@@ -26,6 +26,7 @@
 // +-----------------------------------------------------------------------+
 
 define('PHPWG_ROOT_PATH','./');
+define('PWG_HELP', true);
 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
 
 // +-----------------------------------------------------------------------+
diff --git a/template/yoga/popuphelp.tpl b/template/yoga/popuphelp.tpl
deleted file mode 100644
index ff810c680..000000000
--- a/template/yoga/popuphelp.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{* $Id$ *}
-<div id="content" class="content">
-{$HELP_CONTENT}
-</div> <!-- content -->
-
-<ul class="categoryActions">
-	<li>
-		<a href="#" onclick="window.close();" title="{'Close this window'|@translate}">
-			<img src="{$ROOT_URL}{$themeconf.icon_dir}/exit.png" class="button" alt="exit">
-		</a>
-	</li>
-</ul>
-