diff --git a/system/src/Grav/Common/Session.php b/system/src/Grav/Common/Session.php
index cdc2e9958..795fcae09 100644
--- a/system/src/Grav/Common/Session.php
+++ b/system/src/Grav/Common/Session.php
@@ -21,15 +21,19 @@ class Session extends \RocketTheme\Toolbox\Session\Session
         $config = $this->grav['config'];
 
         if ($config->get('system.session.enabled')) {
+            $session_timeout = $config->get('system.session.timeout', 1800);
+            $session_path = $config->get('system.session.path', '/' . ltrim($uri->rootUrl(false), '/'));
+
             // Define session service.
             parent::__construct(
-                $config->get('system.session.timeout', 1800),
-                $config->get('system.session.path', '/' . ltrim($uri->rootUrl(false), '/'))
+                $session_timeout,
+                $session_path
             );
 
             $site_identifier = $config->get('site.title', 'unkown');
             $this->setName($config->get('system.session.name', 'grav_site') . '_' . substr(md5($site_identifier), 0, 7));
             $this->start();
+            setcookie(session_name(), session_id(), time() + $session_timeout, $session_path);
         }
     }
 }