diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js
index 00badd464169ee35d9a9ee9d8f8d18838318e3d7..1049c65eb90d155c195d62f29cf0cbd7e2db0848 100644
--- a/setup/pub/magento/setup/main.js
+++ b/setup/pub/magento/setup/main.js
@@ -46,7 +46,7 @@ main.controller('navigationController',
                     .error(function (result) {
                     });
             },
-            120000
+            25000
         );
 
         $scope.moduleName = $localStorage.moduleName;
diff --git a/setup/src/Magento/Setup/Controller/Session.php b/setup/src/Magento/Setup/Controller/Session.php
index 60dca02721977be1bb3b92b2abf393ac8814e242..27a13cfa1782747978545a1af2c7cc189591573d 100644
--- a/setup/src/Magento/Setup/Controller/Session.php
+++ b/setup/src/Magento/Setup/Controller/Session.php
@@ -46,10 +46,13 @@ class Session extends AbstractActionController
                 /** @var \Magento\Framework\App\State $adminAppState */
                 $adminAppState = $objectManager->get('Magento\Framework\App\State');
                 $adminAppState->setAreaCode(\Magento\Framework\App\Area::AREA_ADMIN);
-
-                /* @var \Magento\Backend\Model\Auth\Session $session */
                 $sessionConfig = $objectManager->get('Magento\Backend\Model\Session\AdminConfig');
-                $sessionConfig->setCookiePath('/setup');
+                /** @var \Magento\Backend\Model\Url $backendUrl */
+                $backendUrl = $objectManager->get('Magento\Backend\Model\Url');
+                $urlPath = parse_url($backendUrl->getBaseUrl(), PHP_URL_PATH);
+                $cookiePath = $urlPath . 'setup';
+                $sessionConfig->setCookiePath($cookiePath);
+                /* @var \Magento\Backend\Model\Auth\Session $session */
                 $session = $objectManager->create(
                     'Magento\Backend\Model\Auth\Session',
                     [
diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php
index efb17735007779499c11e55c0e57cd22c94c86fd..05ba67306491dea84bc5d7c549f5c77eee7fd9f4 100644
--- a/setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php
@@ -31,7 +31,6 @@ class SessionTest extends \PHPUnit_Framework_TestCase
         $objectManagerProvider = $this->getMock('Magento\Setup\Model\ObjectManagerProvider', ['get'], [], '', false);
         $this->objectManager = $objectManager;
         $this->objectManagerProvider = $objectManagerProvider;
-
         $this->serviceManager = $this->getMock('Zend\ServiceManager\ServiceManager', ['get'], [], '', false);
     }
 
@@ -52,10 +51,12 @@ class SessionTest extends \PHPUnit_Framework_TestCase
         $sessionConfigMock =
             $this->getMock('Magento\Backend\Model\Session\AdminConfig', ['setCookiePath'], [], '', false);
         $sessionConfigMock->expects($this->once())->method('setCookiePath');
+        $urlMock = $this->getMock('\Magento\Backend\Model\Url', [], [], '', false);
 
         $returnValueMap = [
             ['Magento\Framework\App\State', $stateMock],
-            ['Magento\Backend\Model\Session\AdminConfig', $sessionConfigMock]
+            ['Magento\Backend\Model\Session\AdminConfig', $sessionConfigMock],
+            ['Magento\Backend\Model\Url', $urlMock]
         ];
 
         $this->serviceManager->expects($this->once())->method('get')->will($this->returnValue($deployConfigMock));
@@ -69,6 +70,7 @@ class SessionTest extends \PHPUnit_Framework_TestCase
             ->method('create')
             ->will($this->returnValue($sessionMock));
         $controller = new Session($this->serviceManager, $this->objectManagerProvider);
+        $urlMock->expects($this->once())->method('getBaseUrl');
         $controller->prolongAction();
     }