diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 3ff96571d0..d8d93059db 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -344,13 +344,13 @@ class etemplate extends boetemplate
 		{
 			if (!@self::$hooked)
 			{
+				echo $GLOBALS['egw']->framework->header();
 				if((int) $output_mode != 2)
 				{
-					echo $GLOBALS['egw']->framework->navbar();	// do header too
+					echo $GLOBALS['egw']->framework->navbar();
 				}
 				else
 				{
-					echo $GLOBALS['egw']->framework->header();
 					echo '<div id="popupMainDiv">'."\n";
 					if ($GLOBALS['egw_info']['user']['apps']['manual'])	// adding a manual icon to every popup
 					{