diff --git a/public/main/template/default/course_progress/progress.html.twig b/public/main/template/default/course_progress/progress.html.twig
index e8652c4c22..db6a4a8126 100644
--- a/public/main/template/default/course_progress/progress.html.twig
+++ b/public/main/template/default/course_progress/progress.html.twig
@@ -130,7 +130,7 @@
             <h2>{{ "Educational programming"|trans }}</h2>
             <img src="{{ "course_progress.png"|icon(64) }}" width="64" height="64">
             <div class="controls">
-                <a href="{{ _p.web_self }}?{{ _p.web_cid_query ~ "&action=thematic_add" ~ token }}" class="btn btn-outline-primary">
+                <a href="{{ url('legacy_main', {name : 'course_progress/index.php'}) }}?{{ course_url_params ~ "&action=thematic_add" ~ token }}" class="btn btn-outline-primary">
                     {{ "Add thematic"|trans }}
                 </a>
             </div>
diff --git a/src/CourseBundle/EventListener/CourseListener.php b/src/CourseBundle/EventListener/CourseListener.php
index 89105ebb12..1cb9536079 100644
--- a/src/CourseBundle/EventListener/CourseListener.php
+++ b/src/CourseBundle/EventListener/CourseListener.php
@@ -160,7 +160,9 @@ class CourseListener
                 $sessionHandler->set('origin', $origin);
             }
 
-            $sessionHandler->set('cid_req_url', $this->generateCourseUrl($course, $sessionId, $groupId, $origin));
+            $courseParams = $this->generateCourseUrl($course, $sessionId, $groupId, $origin);
+            $sessionHandler->set('course_url_params', $courseParams);
+            $container->get('twig')->addGlobal('course_url_params', $courseParams);
 
             /*if (!$alreadyVisited ||
                 isset($alreadyVisited) && $alreadyVisited != $courseCode
@@ -293,7 +295,7 @@ class CourseListener
         $sessionHandler->remove('_locale_course');
         $sessionHandler->remove('courseObj');
         $sessionHandler->remove('sessionObj');
-        $sessionHandler->remove('cid_req_url');
+        $sessionHandler->remove('course_url_params');
         $sessionHandler->remove('origin');
 
         // Remove user temp roles
diff --git a/src/ThemeBundle/Resources/views/Editor/config_js.html.twig b/src/ThemeBundle/Resources/views/Editor/config_js.html.twig
index ab0a07b7f9..8cbcfda7e9 100644
--- a/src/ThemeBundle/Resources/views/Editor/config_js.html.twig
+++ b/src/ThemeBundle/Resources/views/Editor/config_js.html.twig
@@ -104,8 +104,8 @@ CKEDITOR.editorConfig = function (config) {
     {% endif %}
 
     // File manager (elFinder)
-    config.filebrowserBrowseUrl = '{{ url('editor_filemanager') }}?{{ app.session.get('cid_req_url') }}';
-    config.videobrowserBrowseUrl = '{{ url('editor_filemanager') }}?{{ app.session.get('cid_req_url') }}';
+    config.filebrowserBrowseUrl = '{{ url('editor_filemanager') }}?{{ app.session.get('course_url_params') }}';
+    config.videobrowserBrowseUrl = '{{ url('editor_filemanager') }}?{{ app.session.get('course_url_params') }}';
 
     // Allows to use "class" attribute inside divs and spans.
     config.allowedContent = true;