diff --git a/app/call_forward/call_forward.php b/app/call_forward/call_forward.php
index e95fa55f1e..cdb478d034 100644
--- a/app/call_forward/call_forward.php
+++ b/app/call_forward/call_forward.php
@@ -209,6 +209,9 @@
 	}
 	require_once "resources/header.php";
 
+//set the back button
+	$_SESSION['call_forward_back'] = $_SERVER['PHP_SELF'];
+
 //show the content
 	if ($is_included) {
 		echo "<div class='action_bar sub'>\n";
diff --git a/app/call_forward/call_forward_edit.php b/app/call_forward/call_forward_edit.php
index 2683a22901..a1b2bc6e72 100644
--- a/app/call_forward/call_forward_edit.php
+++ b/app/call_forward/call_forward_edit.php
@@ -533,13 +533,16 @@
 	$object = new token;
 	$token = $object->create($_SERVER['PHP_SELF']);
 
+//save the back button location using referer
+	$back_destination = "window.location.href='" . ($_SESSION['call_forward_back'] ?? "/app/call_forward/call_forward.php") . "'";
+
 //show the content
 	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-call_forward']."</b></div>\n";
 	echo "	<div class='actions'>\n";
-	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','onclick'=>'history.back();']);
+	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','onclick'=>$back_destination]);
 	echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','style'=>'margin-left: 15px;']);
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index b04b7a3705..8542c3430b 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -1061,6 +1061,9 @@
 	$object = new token;
 	$token = $object->create($_SERVER['PHP_SELF']);
 
+//set the back button
+	$_SESSION['call_forward_back'] = $_SERVER['PHP_SELF']  . "?id=$extension_uuid";
+
 //begin the page content
 	require_once "resources/header.php";
 	if ($action == "update") {