diff --git a/client/browser/FinderFileSelect.tsx b/client/browser/FinderFileSelect.tsx
index e48a72525..732c365e8 100644
--- a/client/browser/FinderFileSelect.tsx
+++ b/client/browser/FinderFileSelect.tsx
@@ -1,9 +1,9 @@
 import React, {
-	forwardRef,
 	lazy,
+	memo,
 	Suspense,
+	useCallback,
 	useEffect,
-	useImperativeHandle,
 	useMemo,
 	useRef,
 	useState,
@@ -14,6 +14,7 @@ import ArrowDownIcon from '../icons/arrow-down.svg';
 import ArrowRightIcon from '../icons/arrow-right.svg';
 import EmptyIcon from '../icons/empty.svg';
 import FolderIcon from '../icons/folder.svg';
+import FolderOpenIcon from '../icons/folder-open.svg';
 import RootIcon from '../icons/root.svg';
 
 
@@ -51,38 +52,17 @@ function Figure(props) {
 }
 
 
-const FolderList = forwardRef((props: any, forwardedRef) => {
-	const [files, setFiles] = useState(props.files);
-	const [isLoading, setLoading] = useState(false);
-	const [searchQuery, setSearchQuery] = useState(() => {
-		const params = new URLSearchParams(window.location.search);
-		return params.get('q');
-	});
-
-	useImperativeHandle(forwardedRef, () => ({fetchFiles}));
-
-	async function fetchFiles(folderId) {
-		const params = new URLSearchParams({q: searchQuery});
-		const listFilesUrl = `${props.baseUrl}list/${folderId}${searchQuery ? `?${params.toString()}` : ''}`;
-		setLoading(true);
-		const response = await fetch(listFilesUrl);
-		if (response.ok) {
-			const body = await response.json();
-			setFiles(body.files);
-		} else {
-			console.error(response);
-		}
-		setLoading(false);
-	}
+const FilesList = memo((props: any) => {
+	const {files, isLoading} = props;
 
 	function selectFile(file) {
 		console.log(file);
 	}
 
+	console.log('FolderList', files);
 	return (
 		<ul className="files-list">{
-		isLoading ?
-			<li className="status">{gettext("Loading…")}</li> : files.length === 0 ?
+		files.length === 0 ?
 			<li className="status">{gettext("Empty folder")}</li> :
 		files.map(file => (
 			<li key={file.id} onClick={() => selectFile(file)}><Figure {...file} /></li>
@@ -93,25 +73,28 @@ const FolderList = forwardRef((props: any, forwardedRef) => {
 
 
 function FolderEntry(props) {
-	const {folder, toggleOpen, listFolder} = props;
+	const {folder, toggleOpen, fetchFiles, isCurrent} = props;
 
 	if (folder.is_root) {
-		return (<span onClick={() => listFolder(folder.id)}><RootIcon/></span>);
+		return (<span onClick={() => fetchFiles(folder.id)}><RootIcon/></span>);
 	}
 
 	return (<>
 		<i onClick={toggleOpen}>{
 			folder.has_subfolders ? folder.is_open ? <ArrowDownIcon/> : <ArrowRightIcon/> : <EmptyIcon/>
 		}</i>
-		<span onClick={() => listFolder(folder.id)}>
+		{isCurrent ?
+		<strong><FolderOpenIcon/>{folder.name}</strong> :
+		<span onClick={() => fetchFiles(folder.id)} role="button">
 			<FolderIcon/>{folder.name}
 		</span>
+		}
 	</>);
 }
 
 
 function FolderStructure(props) {
-	const {baseUrl, folder, refreshStructure, folderListRef} = props;
+	const {baseUrl, folder, lastFolderId, fetchFiles, refreshStructure} = props;
 
 	async function fetchChildren() {
 		const response = await fetch(`${baseUrl}fetch/${folder.id}`);
@@ -139,23 +122,26 @@ function FolderStructure(props) {
 		refreshStructure();
 	}
 
-	async function listFolder(folderId) {
-		await folderListRef.current.fetchFiles(folderId);
-	}
-
 	return folder ? (
 		<li>
-			<FolderEntry folder={folder} toggleOpen={toggleOpen} listFolder={listFolder} />
-			{folder.is_open && (<ul>
-				{folder.children.map(child => (
-					<FolderStructure
-						key={child.id}
-						folder={child}
-						baseUrl={baseUrl}
-						refreshStructure={refreshStructure}
-						folderListRef={folderListRef}
-					/>
-				))}
+			<FolderEntry
+				folder={folder}
+				toggleOpen={toggleOpen}
+				fetchFiles={fetchFiles}
+				isCurrent={lastFolderId === folder.id}
+			/>
+			{folder.is_open && (
+			<ul>
+			{folder.children.map(child => (
+				<FolderStructure
+					key={child.id}
+					baseUrl={baseUrl}
+					folder={child}
+					lastFolderId={lastFolderId}
+					fetchFiles={fetchFiles}
+					refreshStructure={refreshStructure}
+				/>
+			))}
 			</ul>)}
 		</li>
 	) : null;
@@ -164,7 +150,12 @@ function FolderStructure(props) {
 
 export default function FinderFileSelect(props) {
 	const baseUrl = props['base-url'];
-	const [structure, setStructure] = useState({root_folder: null, files: []});
+	const [structure, setStructure] = useState({root_folder: null, last_folder: null, files: []});
+	const [isLoading, setLoading] = useState(false);
+	const [searchQuery, setSearchQuery] = useState(() => {
+		const params = new URLSearchParams(window.location.search);
+		return params.get('q');
+	});
 	const folderListRef = useRef(null);
 
 	useEffect(() => {
@@ -180,18 +171,46 @@ export default function FinderFileSelect(props) {
 		}
 	}
 
+	async function fetchFiles(folderId){
+		const params = new URLSearchParams({q: searchQuery});
+		const listFilesUrl = `${baseUrl}list/${folderId}${searchQuery ? `?${params.toString()}` : ''}`;
+		setLoading(true);
+		const newStructure = {root_folder: structure.root_folder, last_folder: folderId, files: []};
+		const response = await fetch(listFilesUrl);
+		if (response.ok) {
+			const body = await response.json();
+			newStructure.files = body.files;
+		} else {
+			console.error(response);
+		}
+		setLoading(false);
+		setStructure(newStructure);
+	}
+
+	function refreshStructure() {
+		console.log('refreshStructure');
+		setStructure({...structure});
+	}
+
 	function handleUpload(folderId) {
 		folderListRef.current.fetchFiles
 	}
 
 	return structure.root_folder && (<>
 		<ul className="folder-structure">
-			<FolderStructure baseUrl={baseUrl} folder={structure.root_folder} folderListRef={folderListRef} refreshStructure={() => {
-				setStructure({...structure});
-			}}/>
+			<FolderStructure
+				baseUrl={baseUrl}
+				folder={structure.root_folder}
+				lastFolderId={structure.last_folder}
+				fetchFiles={fetchFiles}
+				// folderListRef={folderListRef}
+				refreshStructure={refreshStructure}
+			/>
 		</ul>
-		<FileUploader folderId={structure.root_folder} handleUpload={handleUpload}>
-			<FolderList baseUrl={baseUrl} files={structure.files} ref={folderListRef} />
-		</FileUploader>
+		<FileUploader folderId={structure.root_folder} handleUpload={handleUpload}>{
+			isLoading ?
+			<div className="status">{gettext("Loading…")}</div> :
+			<FilesList files={structure.files} />
+		}</FileUploader>
 	</>);
 }
diff --git a/client/finder-browser.scss b/client/finder-browser.scss
index 7d57f6c74..5a701939c 100644
--- a/client/finder-browser.scss
+++ b/client/finder-browser.scss
@@ -31,7 +31,7 @@ finder-file-select {
 				margin-right: 0.5em;
 			}
 
-			span {
+			span[role="button"] {
 				cursor: pointer;
 				&:hover {
 					text-decoration: underline;
@@ -58,15 +58,6 @@ finder-file-select {
 			min-height: 150px;
 			width: 125px;
 
-			&.status {
-				font-size: 18px;
-				font-weight: bold;
-				line-height: 50px;
-				color: #808080;
-				padding-left: 2em;
-				width: auto;
-			}
-
 			.figure {
 				width: 100%;
 				height: 100%;
@@ -115,6 +106,15 @@ finder-file-select {
 		}
 	}
 
+	.status {
+		font-size: 18px;
+		font-weight: bold;
+		line-height: 50px;
+		color: #808080;
+		padding-left: 2em;
+		width: auto;
+	}
+
 	.file-uploader {
 		width: 100%;
 	}
diff --git a/client/icons/folder-open.svg b/client/icons/folder-open.svg
new file mode 100644
index 000000000..fc1f42223
--- /dev/null
+++ b/client/icons/folder-open.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+	<path d="M3 21C2.44772 21 2 20.5523 2 20V4C2 3.44772 2.44772 3 3 3H10.4142L12.4142 5H20C20.5523 5 21 5.44772 21 6V9H19V7H11.5858L9.58579 5H4V16.998L5.5 11H22.5L20.1894 20.2425C20.0781 20.6877 19.6781 21 19.2192 21H3ZM19.9384 13H7.06155L5.56155 19H18.4384L19.9384 13Z"></path>
+</svg>
\ No newline at end of file