diff --git a/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx b/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx
index ebaa93209b373c64f28ad7a972074510601244fb..0f3e7cd9fc50a3cdd7488ffcf9664ba00e459136 100644
--- a/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx
+++ b/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx
@@ -117,8 +117,17 @@ class DataBrowser extends React.Component {
     this.setState({ selectedFile: selectedRow && selectedRow.data })
   }
 
-  handleMultiselect(file) {
-    // TODO: implement
+  handleMultiselect(event) {
+    // event.preventDefault();
+    // event.stopPropagation();
+
+    console.log("handleMultiselect. event: " + event)
+
+    // const { multiselectable, onMultiselect, file } = this.props;
+    //
+    // if (multiselectable && onMultiselect) {
+    //   onMultiselect(file);
+    // }
   }
 
   async onError(error) {
@@ -143,6 +152,7 @@ class DataBrowser extends React.Component {
           onShowInfoChange={this.handleShowInfoChange}
           showInfo={showInfo}
           selectedFile={selectedFile}
+          multiselectedFiles={multiselectedFiles}
         />
         <div className={[classes.flexContainer, classes.boundary, classes.content].join(' ')}>
           {viewType === 'list' && (
@@ -192,6 +202,7 @@ class DataBrowser extends React.Component {
               onSettingsChange={null}
               onError={this.onError}
               onSelectedRowChange={this.handleSelect}
+              onMultiselect={this.handleMultiselect}
               exportXLS={null}
             />
           )}
diff --git a/ui-admin/src/js/components/database/data-browser/LeftToolbar.jsx b/ui-admin/src/js/components/database/data-browser/LeftToolbar.jsx
index 8ddc33308e9ce7c27748b7865329b0c7faeb4866..ffa713a56b2984ba87315cdecbff7ec2f9587e87 100644
--- a/ui-admin/src/js/components/database/data-browser/LeftToolbar.jsx
+++ b/ui-admin/src/js/components/database/data-browser/LeftToolbar.jsx
@@ -134,8 +134,11 @@ class LeftToolbar extends React.Component {
   render() {
     logger.log(logger.DEBUG, 'LeftToolbar.render')
 
-    const { selectedFile } = this.props
-    return selectedFile
+    const { multiselectedFiles } = this.props
+    console.log("multiselectedFiles: " + multiselectedFiles)
+    console.log(multiselectedFiles.size)
+    console.log("multiselectedFiles.size: " + multiselectedFiles.size)
+    return multiselectedFiles && multiselectedFiles.size > 0
         ? this.renderSelectionContextToolbar()
         : this.renderNoSelectionContextToolbar()
   }
diff --git a/ui-admin/src/js/components/database/data-browser/Toolbar.jsx b/ui-admin/src/js/components/database/data-browser/Toolbar.jsx
index bed71003936367a02a4e09e4c2c3711196185604..1065d88ed7ebe62f596a09edf4ce8924927af4f6 100644
--- a/ui-admin/src/js/components/database/data-browser/Toolbar.jsx
+++ b/ui-admin/src/js/components/database/data-browser/Toolbar.jsx
@@ -50,13 +50,13 @@ class Toolbar extends React.Component {
     logger.log(logger.DEBUG, 'Toolbar.render')
 
     const { viewType, onViewTypeChange, classes, showInfo, onShowInfoChange,
-      selectedFile } = this.props
+      selectedFile, multiselectedFiles } = this.props
     return (
       <div className={classes.toolbar}>
         <LeftToolbar
           buttonSize={buttonSize}
           controller={this.controller}
-          selectedFile={selectedFile} />
+          multiselectedFiles={multiselectedFiles} />
         <RightToolbar
           buttonSize={buttonSize}
           selected={showInfo}