diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index ee475d41d0..cb2d6007de 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -47,7 +47,7 @@
 	$language = new text;
 	$text = $language->get();
 
-//return the first item if data type = array, returns value if data type = text 
+//return the first item if data type = array, returns value if data type = text
 	function get_first_item($value) {
 		return is_array($value) ? $value[0] : $value;
 	}
@@ -717,7 +717,7 @@
 													$message = $text['message-duplicate'].(if_group("superadmin") && $_SESSION["domain_name"] != $device_domain_name ? ": ".$device_domain_name : null);
 													message::add($message,'negative');
 												}
-												
+
 												//increment
 												$j++;
 											}
@@ -1113,7 +1113,7 @@
 	$token = $object->create($_SERVER['PHP_SELF']);
 
 //set the back button
-	$_SESSION['call_forward_back'] = $_SERVER['PHP_SELF']  . "?id=$extension_uuid";
+	$_SESSION['call_forward_back'] = $_SERVER['PHP_SELF'].(!empty($extension_uuid) ? '?id='.$extension_uuid : null);
 
 //begin the page content
 	require_once "resources/header.php";