diff --git a/classes/Controller.php b/classes/Controller.php
index 2092d8555..5efead00a 100644
--- a/classes/Controller.php
+++ b/classes/Controller.php
@@ -124,18 +124,17 @@ abstract class ControllerCore
 
 		if ($this->checkAccess())
 		{
-		// postProcess handles ajaxProcess
+			// postProcess handles ajaxProcess
 			$this->postProcess();
-		
-			if ($this->display_header || (isset($this->className) && $this->className))
+			if (!$this->content_only && ($this->display_header || (isset($this->className) && $this->className)))
 			{
 				$this->setMedia();
 				$this->initHeader();
 			}
 	
 			$this->initContent();
-			
-			if ($this->display_footer || (isset($this->className) && $this->className))
+
+			if (!$this->content_only && ($this->display_footer || (isset($this->className) && $this->className)))
 				$this->initFooter();
 
 			// default behavior for ajax process is to use $_POST[action] or $_GET[action]