diff --git a/bundle/LegacyResponse/LegacyResponseManager.php b/bundle/LegacyResponse/LegacyResponseManager.php
index e15ad53d..33371ae0 100644
--- a/bundle/LegacyResponse/LegacyResponseManager.php
+++ b/bundle/LegacyResponse/LegacyResponseManager.php
@@ -11,6 +11,7 @@
 use eZ\Bundle\EzPublishLegacyBundle\LegacyResponse;
 use eZ\Publish\Core\MVC\ConfigResolverInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Templating\EngineInterface;
@@ -44,11 +45,17 @@ class LegacyResponseManager
      */
     private $legacyMode;
 
-    public function __construct(EngineInterface $templateEngine, ConfigResolverInterface $configResolver)
+    /**
+     * @var RequestStack
+     */
+    private $requestStack;
+
+    public function __construct(EngineInterface $templateEngine, ConfigResolverInterface $configResolver, RequestStack $requestStack)
     {
         $this->templateEngine = $templateEngine;
         $this->legacyLayout = $configResolver->getParameter('module_default_layout', 'ezpublish_legacy');
         $this->legacyMode = $configResolver->getParameter('legacy_mode');
+        $this->requestStack = $requestStack;
     }
 
     /**
@@ -63,7 +70,7 @@ public function generateResponseFromModuleResult(ezpKernelResult $result)
     {
         $moduleResult = $result->getAttribute('module_result');
 
-        if (isset($this->legacyLayout) && !$this->legacyMode && !isset($moduleResult['pagelayout'])) {
+        if (isset($this->legacyLayout) && !$this->legacyMode && !$this->legacyResultHasLayout($result)) {
             // Replace original module_result content by filtered one
             $moduleResult['content'] = $result->getContent();
 
@@ -95,6 +102,20 @@ public function generateResponseFromModuleResult(ezpKernelResult $result)
         return $response;
     }
 
+    /**
+     * Checks if $result is already embedded in a layout.
+     * Typically checks if $moduleResult['pagelayout'] is set or if current request is using /layout/set/ route.
+     *
+     * @param ezpKernelResult $result
+     * @return bool
+     */
+    public function legacyResultHasLayout(ezpKernelResult $result)
+    {
+        return
+            isset($result->getAttribute('module_result')['pagelayout'])
+            || $this->requestStack->getMasterRequest()->attributes->get('_route') === '_ezpublishLegacyLayoutSet';
+    }
+
     /**
      * Generates proper RedirectResponse from $redirectResult.
      *
diff --git a/bundle/Resources/config/routing.yml b/bundle/Resources/config/routing.yml
index 7d7875c5..860ca54d 100644
--- a/bundle/Resources/config/routing.yml
+++ b/bundle/Resources/config/routing.yml
@@ -26,3 +26,10 @@ _ezpublishLegacyRest:
         _controller: ezpublish_legacy.rest.controller:restAction
     requirements:
         path: .*
+
+_ezpublishLegacyLayoutSet:
+    path: /layout/set/{path}
+    defaults:
+        _controller: ezpublish_legacy.controller:indexAction
+    requirements:
+        path: .+
diff --git a/bundle/Resources/config/services.yml b/bundle/Resources/config/services.yml
index 02ed36a0..5332acea 100644
--- a/bundle/Resources/config/services.yml
+++ b/bundle/Resources/config/services.yml
@@ -123,7 +123,7 @@ services:
 
     ezpublish_legacy.response_manager:
         class: %ezpublish_legacy.response_manager.class%
-        arguments: ["@templating", "@ezpublish.config.resolver"]
+        arguments: ["@templating", "@ezpublish.config.resolver", "@request_stack"]
 
     ezpublish_legacy.controller:
         class: %ezpublish_legacy.controller.class%
diff --git a/bundle/Tests/LegacyResponse/LegacyResponseManagerTest.php b/bundle/Tests/LegacyResponse/LegacyResponseManagerTest.php
index 9301b354..93100eb1 100644
--- a/bundle/Tests/LegacyResponse/LegacyResponseManagerTest.php
+++ b/bundle/Tests/LegacyResponse/LegacyResponseManagerTest.php
@@ -12,6 +12,8 @@
 use eZ\Bundle\EzPublishLegacyBundle\LegacyResponse;
 use eZ\Publish\Core\MVC\ConfigResolverInterface;
 use PHPUnit_Framework_TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Templating\EngineInterface;
 use ezpKernelResult;
 use ezpKernelRedirect;
@@ -42,7 +44,7 @@ protected function setUp()
     public function testGenerateResponseAccessDenied($errorCode, $errorMessage)
     {
         $this->setExpectedException('Symfony\Component\Security\Core\Exception\AccessDeniedException', $errorMessage);
-        $manager = new LegacyResponseManager($this->templateEngine, $this->configResolver);
+        $manager = new LegacyResponseManager($this->templateEngine, $this->configResolver, new RequestStack());
         $content = 'foobar';
         $moduleResult = array(
             'content' => $content,
@@ -63,6 +65,23 @@ public function generateResponseAccessDeniedProvider()
         );
     }
 
+    public function testLegacyResultHasLayout()
+    {
+        $requestStack = new RequestStack();
+        $requestStack->push(new Request());
+        $manager = new LegacyResponseManager($this->templateEngine, $this->configResolver, $requestStack);
+        self::assertFalse($manager->legacyResultHasLayout(new ezpKernelResult()));
+
+        $resultWithLegacyLayout = new ezpKernelResult('', ['module_result' => ['pagelayout' => 'foo.tpl']]);
+        self::assertTrue($manager->legacyResultHasLayout($resultWithLegacyLayout));
+
+        $request = new Request();
+        $request->attributes->set('_route', '_ezpublishLegacyLayoutSet');
+        $requestStack->pop();
+        $requestStack->push($request);
+        self::assertTrue($manager->legacyResultHasLayout($resultWithLegacyLayout));
+    }
+
     /**
      * Tests response generation when no custom layout can be applied:
      *  - Custom layout provided, but in legacy mode
@@ -72,10 +91,11 @@ public function generateResponseAccessDeniedProvider()
      * @param string|null $customLayout Custom Twig layout being used, or null if none.
      * @param bool $legacyMode Whether legacy mode is active or not.
      * @param bool $moduleResultLayout Whether if module_result from legacy contains a "pagelayout" entry.
+     * @param bool $isLayoutSetModule Whether current request is using /layout/set/ route.
      *
      * @dataProvider generateResponseNoCustomLayoutProvider
      */
-    public function testGenerateResponseNoCustomLayout($customLayout, $legacyMode, $moduleResultLayout)
+    public function testGenerateResponseNoCustomLayout($customLayout, $legacyMode, $moduleResultLayout, $isLayoutSetModule)
     {
         $this->configResolver
             ->expects($this->any())
@@ -92,7 +112,14 @@ public function testGenerateResponseNoCustomLayout($customLayout, $legacyMode, $
             ->expects($this->never())
             ->method('render');
 
-        $manager = new LegacyResponseManager($this->templateEngine, $this->configResolver);
+        $requestStack = new RequestStack();
+        $request = new Request();
+        if ($isLayoutSetModule) {
+            $request->attributes->set('_route', '_ezpublishLegacyLayoutSet');
+        }
+        $requestStack->push($request);
+
+        $manager = new LegacyResponseManager($this->templateEngine, $this->configResolver, $requestStack);
         $content = 'foobar';
         $moduleResult = array(
             'content' => $content,
@@ -113,11 +140,12 @@ public function testGenerateResponseNoCustomLayout($customLayout, $legacyMode, $
     public function generateResponseNoCustomLayoutProvider()
     {
         return array(
-            array(null, false, false),
-            array('foo.html.twig', true, false),
-            array('foo.html.twig', false, true),
-            array(null, false, true),
-            array(null, true, true),
+            array(null, false, false, false),
+            array('foo.html.twig', true, false, false),
+            array('foo.html.twig', false, true, false),
+            array(null, false, true, false),
+            array(null, true, true, false),
+            array(null, false, false, false, true),
         );
     }
 
@@ -149,7 +177,9 @@ public function testGenerateResponseWithCustomLayout($customLayout, $content)
             ->with($customLayout, array('module_result' => $moduleResult))
             ->will($this->returnValue($contentWithLayout));
 
-        $manager = new LegacyResponseManager($this->templateEngine, $this->configResolver);
+        $requestStack = new RequestStack();
+        $requestStack->push(new Request());
+        $manager = new LegacyResponseManager($this->templateEngine, $this->configResolver, $requestStack);
 
         $kernelResult = new ezpKernelResult($content, array('module_result' => $moduleResult));
 
@@ -179,7 +209,7 @@ public function generateResponseWithCustomLayoutProvider()
     public function testGenerateRedirectResponse($uri, $redirectStatus, $expectedStatusCode, $content)
     {
         $kernelRedirect = new ezpKernelRedirect($uri, $redirectStatus, $content);
-        $manager = new LegacyResponseManager($this->templateEngine, $this->configResolver);
+        $manager = new LegacyResponseManager($this->templateEngine, $this->configResolver, new RequestStack());
         $response = $manager->generateRedirectResponse($kernelRedirect);
         $uriInContent = htmlspecialchars($uri);
         $expectedContent = <<<EOT
@@ -222,7 +252,7 @@ public function testMapHeaders()
 
         // Partially mock the manager to simulate calls to header_remove()
         $manager = $this->getMockBuilder('eZ\Bundle\EzPublishLegacyBundle\LegacyResponse\LegacyResponseManager')
-            ->setConstructorArgs(array($this->templateEngine, $this->configResolver))
+            ->setConstructorArgs(array($this->templateEngine, $this->configResolver, new RequestStack()))
             ->setMethods(array('removeHeader'))
             ->getMock();
         $manager