diff --git a/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php b/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
index 711e63944900d6c22bdc777c7023c3b659935240..ebab560c12113692f5e0e7211a4610fdaf616a29 100644
--- a/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
@@ -1235,10 +1235,14 @@ class ElementBrowser {
 		$foldertree->ext_noTempRecyclerDirs = $this->mode == 'filedrag';
 		$tree = $foldertree->getBrowsableTree();
 		list(, , $specUid) = explode('_', $this->PM);
-		if ($this->mode == 'filedrag') {
-			$files = $this->TBE_dragNDrop($this->selectedFolder, $pArr[3]);
+		if ($this->selectedFolder) {
+			if ($this->mode == 'filedrag') {
+				$files = $this->TBE_dragNDrop($this->selectedFolder, $pArr[3]);
+			} else {
+				$files = $this->TBE_expandFolder($this->selectedFolder, $pArr[3], $noThumbs);
+			}
 		} else {
-			$files = $this->TBE_expandFolder($this->selectedFolder, $pArr[3], $noThumbs);
+			$files = '';
 		}
 		// Putting the parts together, side by side:
 		$content .= '
@@ -2249,4 +2253,4 @@ class ElementBrowser {
 		return $result;
 	}
 
-}
\ No newline at end of file
+}