diff --git a/plinth/templates/apps.html b/plinth/templates/apps.html
index 098be288b..439c36a17 100644
--- a/plinth/templates/apps.html
+++ b/plinth/templates/apps.html
@@ -11,42 +11,3 @@
 {% endblock %}
 
 {% block body_class %}apps-page{% endblock %}
-
-{% block tags %}
-  {% if tags %}
-    <div class="container">
-      <div class="dropdown searchable-dropdown">
-        <div class="tag-input">
-          <div id="selected-tags">
-            {% for tag in tags %}
-              <span class="btn btn-light rounded-pill tag"
-                    data-tag="{{ tag }}">
-                {% trans tag %}
-                <button class="btn btn-sm btn-light remove-tag">
-                  <i class="fa fa-times"></i>
-                </button>
-              </span>
-            {% endfor %}
-          </div>
-          <input id="add-tag-input" type="search" class="form-control dropdown-toggle"
-                 data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
-                 autocomplete="off" placeholder="{% trans "Search with tags" %}">
-          <div class="dropdown-menu" aria-labelledby="add-tag-input">
-            <ul class="dropdown-items">
-              {% for tag in all_tags %}
-                {% if tag not in tags %}
-                  <li class="dropdown-item" data-tag="{{ tag }}"
-                      data-tag_l10n="{% trans tag %}">
-                    {% trans tag %}
-                  </li>
-                {% endif %}
-              {% endfor %}
-            </ul>
-          </div>
-          <a href="{% url 'apps' %}" aria-label="{% trans 'Clear all tags' %}"
-             class="btn-close" type="button"></a>
-        </div>
-      </div>
-    </div>
-  {% endif %}
-{% endblock %}
diff --git a/plinth/templates/cards.html b/plinth/templates/cards.html
index 64ac96354..098b20e36 100644
--- a/plinth/templates/cards.html
+++ b/plinth/templates/cards.html
@@ -15,7 +15,9 @@
     </div>
   </div>
 
-  {% block tags %}{% endblock %}
+  {% block tags %}
+    {% include "tags.html" %}
+  {% endblock %}
 
   <div class="container card-container">
     <div class="row">
diff --git a/plinth/templates/tags.html b/plinth/templates/tags.html
new file mode 100644
index 000000000..c263cb8ff
--- /dev/null
+++ b/plinth/templates/tags.html
@@ -0,0 +1,42 @@
+{% comment %}
+# SPDX-License-Identifier: AGPL-3.0-or-later
+{% endcomment %}
+
+{% load i18n %}
+
+{% if tags %}
+  <div class="container">
+    <div class="dropdown searchable-dropdown">
+      <div class="tag-input">
+        <div id="selected-tags">
+          {% for tag in tags %}
+            <span class="btn btn-light rounded-pill tag"
+                  data-tag="{{ tag }}">
+              {% trans tag %}
+              <button class="btn btn-sm btn-light remove-tag">
+                <i class="fa fa-times"></i>
+              </button>
+            </span>
+          {% endfor %}
+        </div>
+        <input id="add-tag-input" type="search" class="form-control dropdown-toggle"
+               data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+               autocomplete="off" placeholder="{% trans "Search with tags" %}">
+        <div class="dropdown-menu" aria-labelledby="add-tag-input">
+          <ul class="dropdown-items">
+            {% for tag in all_tags %}
+              {% if tag not in tags %}
+                <li class="dropdown-item" data-tag="{{ tag }}"
+                    data-tag_l10n="{% trans tag %}">
+                  {% trans tag %}
+                </li>
+              {% endif %}
+            {% endfor %}
+          </ul>
+        </div>
+        <a href="{% url 'apps' %}" aria-label="{% trans 'Clear all tags' %}"
+           class="btn-close" type="button"></a>
+      </div>
+    </div>
+  </div>
+{% endif %}