diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php
index 3b3afeb1f1f65efc81600470551840f27b30bc5d..5d811908bb95cf0751958bbda15928780bd7dc75 100755
--- a/src/Controller/ProjectController.php
+++ b/src/Controller/ProjectController.php
@@ -120,6 +120,7 @@ class ProjectController extends AbstractController
             throw new \Exception('The retrieved capsule is not an instance of Capsule.');
         }
 
+
         $file_system = new Filesystem();
         $parent_directory_name = $capsule->getLinkPath();
         $parent_directory_exists = $file_system->exists('../legacy/' . $parent_directory_name);
@@ -158,6 +159,11 @@ class ProjectController extends AbstractController
                 )
             );
 
+            $url_redirect = $request->query->get('returnUrl');
+            if ($url_redirect) {
+                return $this->redirect($url_redirect);
+            }
+
             return $this->redirectToRoute('capsule_list', [
                 'capsule_id' => $capsule_id
             ]);
diff --git a/templates/capsule/index.html.twig b/templates/capsule/index.html.twig
index 70edbdd9a903756aa6e7c0360e6c1adcba48dbd8..6b73018bfc88fd2f1300e270706194f167cfec2d 100644
--- a/templates/capsule/index.html.twig
+++ b/templates/capsule/index.html.twig
@@ -94,7 +94,7 @@
                     </div>
 
                     <div class="list-item text-nowrap">
-                        <a href="{{ path('edit_video_url', {'capsule_id': capsule.getId()}) }}"
+                        <a href="{{ path('edit_video_url', {'capsule_id': capsule.getId(), 'returnUrl': app.request.requesturi }) }}"
                            class="links text-decoration-none">
                             <i class="fas fa-link m-2"></i>
                             {{ 'capsule.edit.video_url.link'|trans }}