diff --git a/src/client/components/FacetDialog.js b/src/client/components/FacetDialog.js
index 48765be052e929b596cd0838aec35e2e349f9f3a..18446dabfc0fc41b2efe09cdd8b8330d4234aacf 100644
--- a/src/client/components/FacetDialog.js
+++ b/src/client/components/FacetDialog.js
@@ -35,6 +35,7 @@ class FacetDialog extends React.Component {
         onClose={this.handleClose}
         aria-labelledby="form-dialog-title"
         keepMounted={true}
+        disableRestoreFocus={true}
       >
         <DialogTitle disableTypography={true}>
           <Typography variant="h6">{this.props.propertyLabel}</Typography>
diff --git a/src/client/components/ResultTableHead.js b/src/client/components/ResultTableHead.js
index b3ac3e5bdb0dd0fe11e104e441b8891b50564ba9..7c060b132501a64ff836010739a25c12bdb97183 100644
--- a/src/client/components/ResultTableHead.js
+++ b/src/client/components/ResultTableHead.js
@@ -136,7 +136,7 @@ class ResultTableHead extends React.Component {
               >
                 {column.label}
                 {column.filter &&
-                  <Tooltip title={'Filter ' + column.label}>
+                  <Tooltip title={'Filter ' + column.label.toLowerCase()}>
                     <IconButton
                       onClick={this.handleFacetButtonOnClick}
                       aria-label="Filter"