diff --git a/src/client/components/facet_bar/HierarchicalFacet.js b/src/client/components/facet_bar/HierarchicalFacet.js
index 9c23aebeace0f3d9b9821d9d71d1c9a3445a6cdc..60aa4efe153bbf223b44280410d7cfc2ab0ce315 100644
--- a/src/client/components/facet_bar/HierarchicalFacet.js
+++ b/src/client/components/facet_bar/HierarchicalFacet.js
@@ -43,6 +43,9 @@ const styles = () => ({
     marginLeft: 6,
     marginRight: 4,
   },
+  searchMatch: {
+    boxShadow: '0 2px 0 #673ab7',
+  },
   label: {
     // no styling
   },
@@ -73,6 +76,7 @@ class HierarchicalFacet extends Component {
       searchString: '',
       searchFocusIndex: 0,
       searchFoundCount: null,
+      matches: []
     };
   }
 
@@ -225,9 +229,15 @@ class HierarchicalFacet extends Component {
 
   generateLabel = node => {
     let count = node.totalInstanceCount == null || node.totalInstanceCount == 0 ? node.instanceCount : node.totalInstanceCount;
+    let isSearchMatch = false;
+    if (this.state.matches.length > 0) {
+      // console.log(this.state.matches)
+      isSearchMatch = this.state.matches.some(match => match.node.id === node.id);
+    }
+
     return (
       <React.Fragment>
-        <Typography variant='body2'>
+        <Typography className={isSearchMatch ? this.props.classes.searchMatch : ''} variant='body2'>
           {node.prefLabel}
           <span> [{count}]</span>
         </Typography>
@@ -296,6 +306,7 @@ class HierarchicalFacet extends Component {
                 <Input
                   placeholder={`Search...`}
                   onChange={this.handleSearchFieldOnChange}
+                  value={this.state.searchString}
                 >
                 </Input>
                 {searchFoundCount > 0 &&
@@ -331,13 +342,14 @@ class HierarchicalFacet extends Component {
                   searchMethod={customSearchMethod}
                   searchQuery={searchString}
                   searchFocusOffset={searchFocusIndex}
-                  searchFinishCallback={matches =>
+                  searchFinishCallback={matches => {
                     this.setState({
                       searchFoundCount: matches.length,
                       searchFocusIndex:
                           matches.length > 0 ? searchFocusIndex % matches.length : 0,
-                    })
-                  }
+                      matches
+                    });
+                  }}
                   onlyExpandSearchedNodes={true}
                   theme={FileExplorerTheme}
                   generateNodeProps={this.generateNodeProps}
diff --git a/src/client/index.html b/src/client/index.html
index b4f0384c7d88ba29c4f5a606c21f0903ae62adc7..6cdd8cd374d25f70086e905df2e4587eeb88ae7c 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -39,7 +39,10 @@
       align-items: center;
     }
     .rstcustom__rowSearchMatch {
-      box-shadow: 0 2px 0 #673ab7 ;
+      /*box-shadow: 0 2px 0 #673ab7 ;*/
+      -webkit-box-shadow: none;
+	    -moz-box-shadow: none;
+	    box-shadow: none;
     }
     .leaflet-popup-scrolled {
       border: 0px;