diff --git a/lib/file-control.php b/lib/file-control.php
index a15f0be..e2c7d97 100644
--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -16,9 +16,12 @@ $saveType = isset($_GET['saveType']) ? strClean($_GET['saveType']) : "";
 $file = str_replace("|","/",strClean(
 	isset($_POST['newFileName']) && $_POST['newFileName']!=""
 	? $_POST['newFileName']
-	: $_GET['file']
+	: $_REQUEST['file']
 	));
 
+// Establish the actual name as we may have HTML entities in filename
+$file = html_entity_decode($file);
+
 // Put the original $file var aside for use
 $fileOrig = $file;