diff --git a/core/templates/kimera/index.php b/core/templates/kimera/index.php
index 8bbaf88b031..a6c3da2296a 100644
--- a/core/templates/kimera/index.php
+++ b/core/templates/kimera/index.php
@@ -20,6 +20,9 @@
 $opacity2 = $this->params->get('colorSecondaryOpacity', '');
 $bground  = $this->params->get('backgroundImage', $this->params->get('background', 'delauney'));
 
+// Current page (used by the login link)
+$url = Request::getString('REQUEST_URI', '', 'server');
+
 $styles = include_once __DIR__ . '/css/theme.php';
 if ($styles)
 {
@@ -111,7 +114,7 @@
 									</li>
 								<?php } else { ?>
 									<li class="user-account loggedout">
-										<a class="icon-login" href="<?php echo Route::url('index.php?option=com_users&view=login'); ?>" title="<?php echo Lang::txt('TPL_KIMERA_LOGIN'); ?>"><?php echo Lang::txt('TPL_KIMERA_LOGIN'); ?></a>
+										<a class="icon-login" href="<?php echo Route::url('index.php?option=com_users&view=login&return=' . base64_encode($url), false); ?>" title="<?php echo Lang::txt('TPL_KIMERA_LOGIN'); ?>"><?php echo Lang::txt('TPL_KIMERA_LOGIN'); ?></a>
 									</li>
 									<?php if ($this->params->get('registerLink') && Component::params('com_members')->get('allowUserRegistration')) : ?>
 										<li class="user-account-create">