diff --git a/app/assets/javascripts/discourse/app/components/categories-only.hbs b/app/assets/javascripts/discourse/app/components/categories-only.hbs
index e847fb9cb6c..f546cbbe9d3 100644
--- a/app/assets/javascripts/discourse/app/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/app/components/categories-only.hbs
@@ -4,29 +4,45 @@
 >
   {{#if this.categories}}
     {{#if this.filteredCategories}}
-      <table class="category-list {{if this.showTopics 'with-topics'}}">
-        <thead>
-          <tr>
-            <th class="category"><span
-                role="heading"
-                aria-level="2"
-                id="categories-only-category"
-              >{{i18n "categories.category"}}</span></th>
-            <th class="topics">{{i18n "categories.topics"}}</th>
-            {{#if this.showTopics}}
-              <th class="latest">{{i18n "categories.latest"}}</th>
-            {{/if}}
-          </tr>
-        </thead>
-        <tbody aria-labelledby="categories-only-category">
-          {{#each this.categories as |category|}}
-            <ParentCategoryRow
-              @category={{category}}
-              @showTopics={{this.showTopics}}
-            />
-          {{/each}}
-        </tbody>
-      </table>
+      {{#if this.site.mobileView}}
+        <div class="category-list {{if this.showTopics 'with-topics'}}">
+          <PluginOutlet
+            @name="mobile-categories"
+            @outletArgs={{hash categories=this.filteredCategories}}
+          >
+            {{#each this.filteredCategories as |c|}}
+              <ParentCategoryRow
+                @category={{c}}
+                @showTopics={{this.showTopics}}
+              />
+            {{/each}}
+          </PluginOutlet>
+        </div>
+      {{else}}
+        <table class="category-list {{if this.showTopics 'with-topics'}}">
+          <thead>
+            <tr>
+              <th class="category"><span
+                  role="heading"
+                  aria-level="2"
+                  id="categories-only-category"
+                >{{i18n "categories.category"}}</span></th>
+              <th class="topics">{{i18n "categories.topics"}}</th>
+              {{#if this.showTopics}}
+                <th class="latest">{{i18n "categories.latest"}}</th>
+              {{/if}}
+            </tr>
+          </thead>
+          <tbody aria-labelledby="categories-only-category">
+            {{#each this.categories as |category|}}
+              <ParentCategoryRow
+                @category={{category}}
+                @showTopics={{this.showTopics}}
+              />
+            {{/each}}
+          </tbody>
+        </table>
+      {{/if}}
     {{/if}}
 
     {{#if this.mutedCategories}}
@@ -41,34 +57,50 @@
             {{d-icon this.mutedToggleIcon}}
           {{/if}}
         </a>
-        <table
-          class="category-list
-            {{if this.showTopics 'with-topics'}}
-            {{unless this.showMutedCategories 'hidden'}}"
-        >
-          <thead>
-            <tr>
-              <th class="category"><span
-                  role="heading"
-                  aria-level="2"
-                  id="categories-only-category-muted"
-                >{{i18n "categories.category"}}</span></th>
-              <th class="topics">{{i18n "categories.topics"}}</th>
-              {{#if this.showTopics}}
-                <th class="latest">{{i18n "categories.latest"}}</th>
-              {{/if}}
-            </tr>
-          </thead>
-          <tbody aria-labelledby="categories-only-category-muted">
-            {{#each this.categories as |category|}}
+        {{#if this.site.mobileView}}
+          <div
+            class="category-list
+              {{if this.showTopics 'with-topics'}}
+              {{unless this.showMutedCategories 'hidden'}}"
+          >
+            {{#each this.mutedCategories as |c|}}
               <ParentCategoryRow
-                @category={{category}}
+                @category={{c}}
                 @showTopics={{this.showTopics}}
                 @listType="muted"
               />
             {{/each}}
-          </tbody>
-        </table>
+          </div>
+        {{else}}
+          <table
+            class="category-list
+              {{if this.showTopics 'with-topics'}}
+              {{unless this.showMutedCategories 'hidden'}}"
+          >
+            <thead>
+              <tr>
+                <th class="category"><span
+                    role="heading"
+                    aria-level="2"
+                    id="categories-only-category-muted"
+                  >{{i18n "categories.category"}}</span></th>
+                <th class="topics">{{i18n "categories.topics"}}</th>
+                {{#if this.showTopics}}
+                  <th class="latest">{{i18n "categories.latest"}}</th>
+                {{/if}}
+              </tr>
+            </thead>
+            <tbody aria-labelledby="categories-only-category-muted">
+              {{#each this.categories as |category|}}
+                <ParentCategoryRow
+                  @category={{category}}
+                  @showTopics={{this.showTopics}}
+                  @listType="muted"
+                />
+              {{/each}}
+            </tbody>
+          </table>
+        {{/if}}
       </div>
     {{/if}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
deleted file mode 100644
index 0b820b7a736..00000000000
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
+++ /dev/null
@@ -1,38 +0,0 @@
-{{#if this.categories}}
-  {{#if this.filteredCategories}}
-    <div class="category-list {{if this.showTopics 'with-topics'}}">
-      <PluginOutlet
-        @name="mobile-categories"
-        @outletArgs={{hash categories=this.filteredCategories}}
-      >
-        {{#each this.filteredCategories as |c|}}
-          <ParentCategoryRow @category={{c}} @showTopics={{this.showTopics}} />
-        {{/each}}
-      </PluginOutlet>
-    </div>
-  {{/if}}
-
-  {{#if this.mutedCategories}}
-    <div class="muted-categories">
-      <a href class="muted-categories-link" {{on "click" this.toggleShowMuted}}>
-        <h3 class="muted-categories-heading">{{i18n "categories.muted"}}</h3>
-        {{#if this.mutedToggleIcon}}
-          {{d-icon this.mutedToggleIcon}}
-        {{/if}}
-      </a>
-      <div
-        class="category-list
-          {{if this.showTopics 'with-topics'}}
-          {{unless this.showMutedCategories 'hidden'}}"
-      >
-        {{#each this.mutedCategories as |c|}}
-          <ParentCategoryRow
-            @category={{c}}
-            @showTopics={{this.showTopics}}
-            @listType="muted"
-          />
-        {{/each}}
-      </div>
-    </div>
-  {{/if}}
-{{/if}}
\ No newline at end of file