diff --git a/js/about/preferences.js b/js/about/preferences.js
index a133e654b0f..543396a89bc 100644
--- a/js/about/preferences.js
+++ b/js/about/preferences.js
@@ -616,7 +616,7 @@ class SearchTab extends ImmutableComponent {
   }
 
   hoverCallback (rows) {
-    this.props.onChangeSetting(settings.DEFAULT_SEARCH_ENGINE, rows[1].props.children.props.name)
+    this.props.onChangeSetting(settings.DEFAULT_SEARCH_ENGINE, rows[1].value)
   }
 
   render () {
diff --git a/js/components/sortableTable.js b/js/components/sortableTable.js
index 34b12b1af2a..1b0e7ebaa1b 100644
--- a/js/components/sortableTable.js
+++ b/js/components/sortableTable.js
@@ -99,7 +99,8 @@ class SortableTable extends ImmutableComponent {
             const rowAttributes = this.getRowAttributes(row, i)
             return <tr {...rowAttributes}
               data-context-menu-disable={rowAttributes.onContextMenu ? true : undefined}
-              className={this.hasRowClassNames ? this.props.rowClassNames[i] : undefined}>{entry}</tr>
+              className={this.hasRowClassNames ? this.props.rowClassNames[i] + ' ' + rowAttributes.className
+                : rowAttributes.className}>{entry}</tr>
           })
         }
       </tbody>