diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php
index 477f2378..c5453026 100644
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@@ -491,6 +491,7 @@ JS
 				return $folder;
 			}
 		}
+		$this->setCurrentPageID(null);
 		return new Folder();
 	}