diff --git a/plinth/templates/app-header.html b/plinth/templates/app-header.html
index 4e25d8096..e5c90d58b 100644
--- a/plinth/templates/app-header.html
+++ b/plinth/templates/app-header.html
@@ -46,7 +46,7 @@
     {% if app_info.tags %}
       <div class="app-tags d-flex align-items-center flex-wrap">
         {% for tag in app_info.tags %}
-        {% if not forloop.first %}•{% endif %}
+          {% if not forloop.first %}•{% endif %}
           <a href="{{ active_section_url }}?tag={{ tag|urlencode }}"
              class="btn btn-default rounded-pill tag">
             {% trans tag %}
diff --git a/plinth/templates/apps-add.html b/plinth/templates/apps-add.html
new file mode 100644
index 000000000..02312290a
--- /dev/null
+++ b/plinth/templates/apps-add.html
@@ -0,0 +1,25 @@
+{% extends 'cards.html' %}
+{% comment %}
+# SPDX-License-Identifier: AGPL-3.0-or-later
+{% endcomment %}
+
+{% load static %}
+{% load i18n %}
+
+{% block page_js %}
+  <script src="{% static 'tags.js' %}" defer></script>
+{% endblock %}
+
+{% block body_class %}apps-add-page{% endblock %}
+
+{% block header-container %}
+  <div class="card-section-title">{% trans "Add New App" %}</div>
+{% endblock %}
+
+{% block cards-empty %}
+  <p class="text-center">
+    {% blocktrans trimmed %}
+      There are no more apps available to add.
+    {% endblocktrans %}
+  </p>
+{% endblock %}
diff --git a/plinth/templates/apps.html b/plinth/templates/apps.html
index 5b5112706..99a57b87b 100644
--- a/plinth/templates/apps.html
+++ b/plinth/templates/apps.html
@@ -5,9 +5,27 @@
 
 {% load static %}
 {% load i18n %}
+{% load extras %}
 
 {% block page_js %}
   <script src="{% static 'tags.js' %}" defer></script>
 {% endblock %}
 
 {% block body_class %}apps-page{% endblock %}
+
+{% block toolbar-container %}
+  <div class="btn-toolbar" role="toolbar">
+    <a class="btn btn-primary" href="{% url 'apps-add' %}" role="button">
+      {% icon 'plus' %}
+      {% trans "Add new app" %}
+    </a>
+  </div>
+{% endblock %}
+
+{% block cards-empty %}
+  <p class="text-center">
+    {% blocktrans trimmed %}
+      There are currently no apps added.
+    {% endblocktrans %}
+  </p>
+{% endblock %}
diff --git a/plinth/templates/cards.html b/plinth/templates/cards.html
index be49d25d6..6cfe29b6b 100644
--- a/plinth/templates/cards.html
+++ b/plinth/templates/cards.html
@@ -20,45 +20,28 @@
     {% include "tags.html" %}
   {% endblock %}
 
-  <div class="btn-toolbar container" role="toolbar">
-    <a class="btn btn-primary" href="#available-for-install-container"
-       data-bs-toggle="collapse" role="button" aria-expanded="false"
-       aria-controls="available-for-install-container">
-      {% icon 'plus' %}
-      {% trans "Add new app" %}
-    </a>
-  </div>
-
   <div class="container card-container">
-    <div class="row">
-      <div class="card-list card-list-primary">
-        {% for item in menu_items %}
-          {% if not show_disabled or item.is_enabled %}
+    {% block header-container %}
+    {% endblock %}
+
+    {% block toolbar-container %}
+    {% endblock %}
+
+    {% if menu_items %}
+      <div class="row">
+        <div class="card-list">
+          {% for item in menu_items %}
             {% if advanced_mode or not item.advanced %}
               {% include "card.html" %}
             {% endif %}
-          {% endif %}
-        {% endfor %}
-      </div>
-    </div>
-  </div>
-
-  {% if show_disabled %}
-    <div class="container card-container collapse" id="available-for-install-container">
-      <div class="card-section-title">{% trans "Available for install" %}</div>
-      <div class="row">
-        <div class="card-list card-list-disabled">
-          {% for item in menu_items %}
-            {% if not item.is_enabled %}
-              {% if advanced_mode or not item.advanced %}
-                {% include "card.html" %}
-              {% endif %}
-            {% endif %}
           {% endfor %}
         </div>
       </div>
-    </div>
-  {% endif %}
+    {% else %}
+      {% block cards-empty %}
+      {% endblock %}
+    {% endif %}
+  </div>
 
   {% block content-container %}
   {% endblock %}
diff --git a/plinth/urls.py b/plinth/urls.py
index 59bc844d8..6fec30dfe 100644
--- a/plinth/urls.py
+++ b/plinth/urls.py
@@ -23,7 +23,8 @@ urlpatterns = [
     re_path(r'^language-selection/$',
             public(views.LanguageSelectionView.as_view()),
             name='language-selection'),
-    re_path(r'^apps/$', views.AppsIndexView.as_view(), name='apps'),
+    re_path(r'^apps/$', views.AppsView.as_view(), name='apps'),
+    re_path(r'^apps/add/$', views.AppsAddView.as_view(), name='apps-add'),
     re_path(r'^sys/$', views.system_index, name='system'),
     re_path(r'', include((system_urlpatterns, 'system'))),
     re_path(r'^uninstall/(?P<app_id>[1-9a-z\-_]+)/$',
diff --git a/plinth/views.py b/plinth/views.py
index 76d2c2c3f..7e1d20031 100644
--- a/plinth/views.py
+++ b/plinth/views.py
@@ -266,8 +266,8 @@ def _get_all_tags(menu_items: list[menu.Menu]) -> list[str]:
     return sorted(get_tags(menu_items), key=_)
 
 
-class AppsIndexView(TemplateView):
-    """View for apps index.
+class AppsView(TemplateView):
+    """View for showing installed apps.
 
     This view supports filtering apps by one or more tags. If no tags are
     provided, it will show all the apps. If one or more tags are provided,
@@ -277,11 +277,39 @@ class AppsIndexView(TemplateView):
 
     def get_context_data(self, *args, **kwargs):
         context = super().get_context_data(*args, **kwargs)
-        context['show_disabled'] = True
         context['advanced_mode'] = get_advanced_mode()
 
         tags = self.request.GET.getlist('tag', [])
-        menu_items = menu.main_menu.active_item(self.request).items
+        menu_items = [
+            item for item in menu.main_menu.active_item(self.request).items
+            if item.is_enabled()
+        ]
+
+        context['tags'] = tags
+        context['all_tags'] = _get_all_tags(menu_items)
+        context['menu_items'] = _pick_menu_items(menu_items, tags)
+
+        return context
+
+
+class AppsAddView(TemplateView):
+    """View for showing apps that can be installed.
+
+    This view supports filtering apps by one or more tags. If no tags are
+    provided, it will show all the apps. If one or more tags are provided,
+    it will select apps matching any of the provided tags.
+    """
+    template_name = 'apps-add.html'
+
+    def get_context_data(self, *args, **kwargs):
+        context = super().get_context_data(*args, **kwargs)
+        context['advanced_mode'] = get_advanced_mode()
+
+        tags = self.request.GET.getlist('tag', [])
+        menu_items = [
+            item for item in menu.main_menu.active_item(self.request).items
+            if not item.is_enabled()
+        ]
 
         context['tags'] = tags
         context['all_tags'] = _get_all_tags(menu_items)