diff --git a/ui-admin/src/js/components/database/DatabaseComponent.jsx b/ui-admin/src/js/components/database/DatabaseComponent.jsx
index 4ef9938acee0262177acddfbda04790a03b0c3b0..9d6e4ddcadc2b54eb09b6e685d3a7358d97ad31d 100644
--- a/ui-admin/src/js/components/database/DatabaseComponent.jsx
+++ b/ui-admin/src/js/components/database/DatabaseComponent.jsx
@@ -1,7 +1,7 @@
 import React from "react";
 import Container from "@src/js/components/common/form/Container.jsx";
 import AppController from "@src/js/components/AppController.js";
-import DataBrowser from "@src/js/components/database/data-browser/DataBrowser";
+import DataBrowser from "@src/js/components/database/data-browser/DataBrowser.jsx";
 import openbis from "@src/js/services/openbis.js";
 import objectType from "@src/js/common/consts/objectType.js";
 import logger from "@src/js/common/logger.js";
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 d6883f79eace35706415a9f9693ce450dfad7401..f633d7f2f9a62d3c90b2ac8bbaddfbf5b44fa230 100644
--- a/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx
+++ b/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx
@@ -1,7 +1,7 @@
 import React from "react";
-import Toolbar from "@src/js/components/database/data-browser/Toolbar";
-import ListBrowser from "@src/js/components/database/data-browser/ListBrowser";
-import GalleryBrowser from "@src/js/components/database/data-browser/GalleryBrowser";
+import Toolbar from "@src/js/components/database/data-browser/Toolbar.jsx";
+import ListBrowser from "@src/js/components/database/data-browser/ListBrowser.jsx";
+import GalleryBrowser from "@src/js/components/database/data-browser/GalleryBrowser.jsx";
 
 const styles = theme => ({
     containerDefault: {
@@ -14,7 +14,7 @@ const styles = theme => ({
 
 class DataBrowser extends React.Component {
     render() {
-        const { view } = this.state;
+        const { view } = this.props;
 
         return (
             <div>