diff --git a/client/app/scripts/components/search.js b/client/app/scripts/components/search.js
index 65259cc43..e0ef693e4 100644
--- a/client/app/scripts/components/search.js
+++ b/client/app/scripts/components/search.js
@@ -140,7 +140,7 @@ class Search extends React.Component {
           {!showPinnedSearches && <div className="search-hint">
             {getHint(nodes)} <span
               className="search-help-link fa fa-question-circle"
-              onClick={onClickHelp} />
+              onMouseDown={onClickHelp} />
           </div>}
         </div>
       </div>
diff --git a/client/app/scripts/utils/search-utils.js b/client/app/scripts/utils/search-utils.js
index aec25f632..67064904f 100644
--- a/client/app/scripts/utils/search-utils.js
+++ b/client/app/scripts/utils/search-utils.js
@@ -271,7 +271,7 @@ export function getSearchableFields(nodes) {
 
   const tableRowLabels = nodes.reduce((labels, node) => (
     labels.union(get(node, 'tables').flatMap(t => (t.get('rows') || makeList)
-      .map(f => f.get('label'))
+      .map(f => f.getIn(['entries', 'label']))
     ))
   ), makeSet());