diff --git a/code/controllers/CMSFileAddController.php b/code/controllers/CMSFileAddController.php
index 984f3e9d..67c629d2 100644
--- a/code/controllers/CMSFileAddController.php
+++ b/code/controllers/CMSFileAddController.php
@@ -57,6 +57,10 @@ class CMSFileAddController extends LeftAndMain {
 		Requirements::javascript(FRAMEWORK_DIR . '/javascript/AssetUploadField.js');
 		Requirements::css(FRAMEWORK_DIR . '/css/AssetUploadField.css');
 
+		if($currentPageID = $this->currentPageID()){
+			Session::set("{$this->class}.currentPage", $currentPageID);	
+		}
+		
 		$folder = $this->currentPage();
 
 		$uploadField = UploadField::create('AssetUploadField', '');