diff --git a/administrator/components/com_templates/src/Controller/TemplateController.php b/administrator/components/com_templates/src/Controller/TemplateController.php
index 619aaa6b65f2f..34285fe96bea2 100644
--- a/administrator/components/com_templates/src/Controller/TemplateController.php
+++ b/administrator/components/com_templates/src/Controller/TemplateController.php
@@ -80,6 +80,12 @@ public function close()
         $id   = (int) $this->input->get('id', 0, 'int');
         $url  = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' .
             $file . '&isMedia=' . $this->input->getInt('isMedia', 0);
+
+        // If the file was opened from the Updated Files tab, redirect back there.
+        if ($this->input->getCmd('return', '') === 'updated_files') {
+            $url .= '#files';
+        }
+
         $this->setRedirect(Route::_($url, false));
     }
 
@@ -360,6 +366,12 @@ public function save()
                 $file = base64_encode('home');
                 $id   = (int) $this->input->get('id', 0, 'int');
                 $url  = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file . '&isMedia=' . $this->input->getInt('isMedia', 0);
+
+                // If the file was opened from the Updated Files tab, redirect back there.
+                if ($this->input->getCmd('return', '') === 'updated_files') {
+                    $url .= '#files';
+                }
+
                 $this->setRedirect(Route::_($url, false));
                 break;
         }
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index 1467d9d7f532a..fbacd0724dbd9 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -123,6 +123,9 @@
                             <?php endif; ?>
                             <form action="<?php echo Route::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file . '&isMedia=' . $input->get('isMedia', 0)); ?>" method="post" name="adminForm" id="adminForm">
                                 <input type="hidden" name="isMedia" value="<?php echo $input->get('isMedia', 0); ?>">
+                                <?php if ($returnParam = $input->getCmd('return', '')) : ?>
+                                    <input type="hidden" name="return" value="<?php echo $this->escape($returnParam); ?>">
+                                <?php endif; ?>
                                 <div class="editor-border">
                                     <?php echo $this->form->getInput('source'); ?>
                                 </div>
diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php
index 978eb67ebf3bd..710c3513f767a 100644
--- a/administrator/components/com_templates/tmpl/template/default_updated_files.php
+++ b/administrator/components/com_templates/tmpl/template/default_updated_files.php
@@ -75,7 +75,7 @@
                                     <?php echo HTMLHelper::_('jgrid.published', $value->state, $i, 'template.', 1, 'cb', null, null, 'updateForm'); ?>
                                 </td>
                                 <td>
-                                    <a href="<?php echo Route::_('index.php?option=com_templates&view=template&id=' . (int) $value->extension_id . '&file=' . $value->hash_id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?>"><?php echo base64_decode($value->hash_id); ?></a>
+                                    <a href="<?php echo Route::_('index.php?option=com_templates&view=template&id=' . (int) $value->extension_id . '&file=' . $value->hash_id . '&return=updated_files'); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?>"><?php echo base64_decode($value->hash_id); ?></a>
                                 </td>
                                 <td>
                                     <?php $created_date = $value->created_date; ?>