This change works fine here for #23934

diff --git a/administrator/components/com_modules/tmpl/module/edit.php b/administrator/components/com_modules/tmpl/module/edit.php
index 6ed075f..8a076bb 100644
--- a/administrator/components/com_modules/tmpl/module/edit.php
+++ b/administrator/components/com_modules/tmpl/module/edit.php
@@ -15,4 +15,5 @@
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
 
 HTMLHelper::_('behavior.formvalidator');
@@ -198,4 +199,10 @@
 		<?php echo $this->form->getInput('module'); ?>
 		<?php echo $this->form->getInput('client_id'); ?>
+
+		<?php // Redirect to CPanel when the module has been edited from there. ?>
+		<?php $url = htmlspecialchars($_SERVER['HTTP_REFERER']); ?>
+		<?php if ($this->item->client_id == 1 && ($url == Uri::root() . 'administrator/index.php' || $url == Uri::root() . 'administrator/index.php?option=com_cpanel')) : ?>
+			<input type="hidden" name="return" value="<?php echo base64_encode('index.php?option=com_cpanel') ?>">
+		<?php endif; ?>
 	</div>
 </form>

I guess we also could use a code using session.
Not sure what is the best solution

Ok I guess after the edit is merged I or @C-Lodder can add this "fix" to the module or should this fix be done to all possible places? Then the places should be maybe listed.
I can think of - edit userprofile ... but which else?

we must first decide if we should use that kind of code or not.

after some discussion, that code is not the right way.
will test another and, if it works fine, will make pr

I wait for @C-Lodder pr to be merged to propose the patch as the main change is in fact in the url in modules.php

Thank you :)

Please test #24109 for the CPanel modules

@infograf768 #23934 to test.

Set to "closed" on behalf of @franz-wohlkoenig by The JTracker Application at issues.joomla.org/joomla-cms/24109

closed as having Pull Request #23934

@franz-wohlkoenig
#23934 was merged and that is why I could make the new PR :)

I reopen this as it did not only concern the cpanel modules but eventually other places in core where the redirect would be nice to implement.

Please, all, state which precise places.

@chmst
Also proposed for Edit Account
#24281

This should be closed. The original issue has been resolved as have lots of other similar "return to origin" issues. If there are any new links that need to "return to origin" then they should be in their own new issue/pr

closed as stated above.