diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php
index 6bfbc76c..00b8cd55 100644
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@@ -85,6 +85,15 @@ JS
 		CMSBatchActionHandler::register('delete', 'AssetAdmin_DeleteBatchAction', 'Folder');
 	}
 		
+	/**
+	 * Return the root 'asset' folder CMSFields
+	 * 
+	 * @return FieldList
+	 */
+	public function RootForm() {
+		return $this->getEditForm(singleton('Folder'));
+	}
+	
 	/**
 	 * Show the content of the upload iframe.  The form is specified by a template.
 	 */
@@ -193,8 +202,11 @@ JS
 		}
 		$processedData = array_reverse($processedData);
 				
-		if($data['FolderID'] && $data['FolderID'] != '') $folder = DataObject::get_by_id("Folder", $data['FolderID']);
-		else $folder = singleton('Folder');
+		if(isset($data['FolderID']) && is_numeric($data['FolderID'])) {
+			$folder = DataObject::get_by_id("Folder", $data['FolderID']);
+		} else {
+			$folder = singleton('Folder');
+		}
 
 		foreach($processedFiles as $filePostId => $tmpFile) {
 			if($tmpFile['error'] == UPLOAD_ERR_NO_TMP_DIR) {