diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 7090b71c773..f8ac8ab0be0 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -145,12 +145,13 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 
     if (is_object($object) && $object->id > 0) {
         if ($backtopage) {
-            header('Location: '.$backtopage);
+        	header('Location: '.$backtopage);
             exit;
         }
         else
         {
-            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(GETPOST('section_dir', 'alpha') ? '&section_dir='.urlencode(GETPOST('section_dir', 'alpha')) : '').(!empty($withproject) ? '&withproject=1' : ''));
+        	$tmpurl = $_SERVER["PHP_SELF"].'?id='.$object->id.(GETPOST('section_dir', 'alpha') ? '&section_dir='.urlencode(GETPOST('section_dir', 'alpha')) : '').(!empty($withproject) ? '&withproject=1' : '');
+        	header('Location: '.$tmpurl);
             exit;
         }
     }
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index a9a7df300c3..31d0b449d5b 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -356,10 +356,12 @@ if ($useajax || $action == 'delete')
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 	$useglobalvars = 1;
 	$form = new Form($db);
-	$formquestion['urlfile'] = array('type'=>'hidden', 'value'=>$urlfile, 'name'=>'urlfile'); // We must always put field, even if empty because it is fille by javascript later
-	$formquestion['section'] = array('type'=>'hidden', 'value'=>$section, 'name'=>'section'); // We must always put field, even if empty because it is fille by javascript later
-	$formquestion['section_id'] = array('type'=>'hidden', 'value'=>$section_id, 'name'=>'section_id'); // We must always put field, even if empty because it is fille by javascript later
-	$formquestion['section_dir'] = array('type'=>'hidden', 'value'=>$section_dir, 'name'=>'section_dir'); // We must always put field, even if empty because it is fille by javascript later
+	$formquestion['urlfile'] = array('type'=>'hidden', 'value'=>$urlfile, 'name'=>'urlfile'); // We must always put field, even if empty because it is filled by javascript later
+	$formquestion['section'] = array('type'=>'hidden', 'value'=>$section, 'name'=>'section'); // We must always put field, even if empty because it is filled by javascript later
+	$formquestion['section_id'] = array('type'=>'hidden', 'value'=>$section_id, 'name'=>'section_id'); // We must always put field, even if empty because it is filled by javascript later
+	$formquestion['section_dir'] = array('type'=>'hidden', 'value'=>$section_dir, 'name'=>'section_dir'); // We must always put field, even if empty because it is filled by javascript later
+	$formquestion['sortfield'] = array('type'=>'hidden', 'value'=>$sortfield, 'name'=>'sortfield'); // We must always put field, even if empty because it is filled by javascript later
+	$formquestion['sortorder'] = array('type'=>'hidden', 'value'=>$sortorder, 'name'=>'sortorder'); // We must always put field, even if empty because it is filled by javascript later
 	if (!empty($action) && $action == 'file_manager')	$formquestion['file_manager'] = array('type'=>'hidden', 'value'=>1, 'name'=>'file_manager');
 	if (!empty($websitekey))							$formquestion['website'] = array('type'=>'hidden', 'value'=>$websitekey, 'name'=>'website');
 	if (!empty($pageid) && $pageid > 0)				$formquestion['pageid'] = array('type'=>'hidden', 'value'=>$pageid, 'name'=>'pageid');
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c543fd436a2..914106ac49a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4386,7 +4386,7 @@ class Form
                     buttons: {
                         "'.dol_escape_js($langs->transnoentities("Yes")).'": function() {
                         	var options = "&token='.urlencode(newToken()).'";
-                        	var inputok = '.json_encode($inputok).';
+                        	var inputok = '.json_encode($inputok).';	/* List of fields into form */
                          	var pageyes = "'.dol_escape_js(!empty($pageyes) ? $pageyes : '').'";
                          	if (inputok.length>0) {
                          		$.each(inputok, function(i, inputname) {
@@ -4405,7 +4405,7 @@ class Form
                         },
                         "'.dol_escape_js($langs->transnoentities("No")).'": function() {
                         	var options = "&token='.urlencode(newToken()).'";
-                         	var inputko = '.json_encode($inputko).';
+                         	var inputko = '.json_encode($inputko).';	/* List of fields into form */
                          	var pageno="'.dol_escape_js(!empty($pageno) ? $pageno : '').'";
                          	if (inputko.length>0) {
                          		$.each(inputko, function(i, inputname) {
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index a6feeea3346..437ef5b498d 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -327,6 +327,8 @@ if ($cancel)
 
 $savbacktopage = $backtopage;
 $backtopage = $_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid.(GETPOST('section_dir', 'alpha') ? '&section_dir='.urlencode(GETPOST('section_dir', 'alpha')) : ''); // used after a confirm_deletefile into actions_linkedfiles.inc.php
+if ($sortfield) $backtopage.='&sortfield='.$sortfield;
+if ($sortorder) $backtopage.='&sortorder='.$sortorder;
 include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 $backtopage = $savbacktopage;