diff --git a/src/amo/components/Category/index.js b/src/amo/components/Category/index.js
index 0d4989facb9..5a921fcd888 100644
--- a/src/amo/components/Category/index.js
+++ b/src/amo/components/Category/index.js
@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 
 import CategoryHeader from 'amo/components/CategoryHeader';
-import Search from 'amo/components/Search';
+import { SearchBase } from 'amo/components/Search';
 import { categoriesFetch } from 'core/actions/categories';
 import { loadByCategoryIfNeeded, parsePage } from 'core/searchUtils';
 import {
@@ -35,7 +35,7 @@ export class CategoryBase extends React.Component {
     return (
       <div className="Category">
         <CategoryHeader category={category} />
-        <Search enableSearchSort={false} {...searchProps} />
+        <SearchBase enableSearchSort={false} hasSearchParams {...searchProps} />
       </div>
     );
   }
@@ -65,7 +65,6 @@ export function mapStateToProps(state, ownProps) {
     return {
       addonType: filters.addonType,
       category,
-      hasSearchParams: true,
       filters,
       pathname,
       queryParams,
@@ -76,7 +75,6 @@ export function mapStateToProps(state, ownProps) {
   return {
     addonType: filters.addonType,
     category,
-    hasSearchParams: true,
     pathname,
     queryParams,
   };
diff --git a/tests/unit/amo/components/TestCategory.js b/tests/unit/amo/components/TestCategory.js
index 97424666bd3..508f3f8b368 100644
--- a/tests/unit/amo/components/TestCategory.js
+++ b/tests/unit/amo/components/TestCategory.js
@@ -2,7 +2,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { CategoryBase, mapStateToProps } from 'amo/components/Category';
-import Search from 'amo/components/Search';
+import { SearchBase } from 'amo/components/Search';
 import createStore from 'amo/store';
 import { categoriesFetch } from 'core/actions/categories';
 import { searchStart } from 'core/actions/search';
@@ -50,7 +50,16 @@ describe('Category', () => {
 
   it('disables the sort component in Search', () => {
     const root = render();
-    expect(root.find(Search)).toHaveProp('enableSearchSort', false);
+
+    expect(root.find(SearchBase)).toHaveProp('enableSearchSort', false);
+  });
+
+  it('forces hasSearchParams for the Search component', () => {
+    // This prevents search results not appearing because the search
+    // component doesn't recognise a valid search param.
+    const root = render();
+
+    expect(root.find(SearchBase)).toHaveProp('hasSearchParams', true);
   });
 });
 
@@ -84,7 +93,6 @@ describe('Category.mapStateToProps()', () => {
       category: null,
       count: 0,
       filters,
-      hasSearchParams: true,
       loading: true,
       page: undefined,
       pathname: '/themes/ad-block/',
@@ -103,7 +111,6 @@ describe('Category.mapStateToProps()', () => {
     expect(props).toEqual({
       addonType: ADDON_TYPE_THEME,
       category: null,
-      hasSearchParams: true,
       pathname: '/themes/ad-block/',
       queryParams: { page: 1 },
     });