diff --git a/components/SearchBar/SearchBar.jsx b/components/SearchBar/SearchBar.jsx
index e73eeb6d1..42d30ca59 100644
--- a/components/SearchBar/SearchBar.jsx
+++ b/components/SearchBar/SearchBar.jsx
@@ -212,7 +212,7 @@ class SearchBar extends Component {
 }
 
 SearchBar.propTypes = {
-  hideSuggestionsWhenEmpty: PropTypes.func.bool,
+  hideSuggestionsWhenEmpty: PropTypes.bool,
   onSearch     : PropTypes.func.isRequired,
   onClearSearch : PropTypes.func,
   onTermChange : PropTypes.func.isRequired,
diff --git a/components/SearchSuggestions/SearchSuggestions.jsx b/components/SearchSuggestions/SearchSuggestions.jsx
index e1c7e9aee..d305ce4d2 100644
--- a/components/SearchSuggestions/SearchSuggestions.jsx
+++ b/components/SearchSuggestions/SearchSuggestions.jsx
@@ -56,7 +56,7 @@ class SearchSuggestions extends Component {
 
     const recentSearches = !recentList ? '' : (
 			<div className="recent-search-suggestions">
-				<Panel>
+				<Panel showHeader={this.props.showPopularSearchHeader}>
 					<div className="panel-header">
 						<div className="label">Recent Search</div>
 						<div className="recent-search-panel-actions transition">
diff --git a/components/SwitchButton/SwitchButton.scss b/components/SwitchButton/SwitchButton.scss
index d40a2f2d3..4a93467aa 100644
--- a/components/SwitchButton/SwitchButton.scss
+++ b/components/SwitchButton/SwitchButton.scss
@@ -3,6 +3,7 @@
 .SwitchButton {
   position: relative;
   display: flex;
+  align-items: center;
   .label{
     width: 92px;
     line-height: 20px;
@@ -11,9 +12,9 @@
     color: $tc-gray-60;
   }
   label{
+    display: flex;
     margin: 0;
     padding: 0;
-    display: block;
     height: 20px;
     margin-top: 5px;
   }