diff --git a/openbis_ng_ui/index.html b/openbis_ng_ui/index.html
index 4778a58b34a0e34da41a6e14b376f8eb3996f5ab..2f83fb57a0e5a806a6e696946e60be7d8eb1b8ce 100644
--- a/openbis_ng_ui/index.html
+++ b/openbis_ng_ui/index.html
@@ -16,10 +16,6 @@
       #app {
         height: 100%;
       }
-      #app > div,
-      #app > div > div {
-        height: 100%;
-      }
       #error {
         margin-left: 20px;
       }
diff --git a/openbis_ng_ui/src/js/components/common/error/Error.jsx b/openbis_ng_ui/src/js/components/common/error/Error.jsx
index 6137e439f75d6dc28323db17da301d058f8a0275..1a802d631306601e05835e1b87844e1bc903659d 100644
--- a/openbis_ng_ui/src/js/components/common/error/Error.jsx
+++ b/openbis_ng_ui/src/js/components/common/error/Error.jsx
@@ -1,13 +1,22 @@
 import React from 'react'
+import { withStyles } from '@material-ui/core/styles'
 import ErrorDialog from '@src/js/components/common/dialog/ErrorDialog.jsx'
 import logger from '@src/js/common/logger.js'
 
+const styles = {
+  container: {
+    height: '100%'
+  }
+}
+
 class Error extends React.Component {
   render() {
     logger.log(logger.DEBUG, 'Error.render')
 
+    const { classes } = this.props
+
     return (
-      <div>
+      <div className={classes.container}>
         {this.props.error && (
           <ErrorDialog
             error={this.props.error}
@@ -20,4 +29,4 @@ class Error extends React.Component {
   }
 }
 
-export default Error
+export default withStyles(styles)(Error)