diff --git a/themes/grav/templates/partials/plugins-list.html.twig b/themes/grav/templates/partials/plugins-list.html.twig
index 4d702443..7a52dab0 100644
--- a/themes/grav/templates/partials/plugins-list.html.twig
+++ b/themes/grav/templates/partials/plugins-list.html.twig
@@ -5,8 +5,7 @@
 </h1>
 
 <table>
-    {% for slug, package in admin.plugins(not installing) %}
-        {% set plugin = package.toArray() %}
+    {% for slug, plugin in admin.plugins(not installing).toArray|ksort %}
         {% set data = admin.data('plugins/' ~ slug) %}
 
         <tr data-gpm-plugin="{{ slug|url_encode }}">
diff --git a/themes/grav/templates/partials/themes-list.html.twig b/themes/grav/templates/partials/themes-list.html.twig
index 47703fae..689cb6c2 100644
--- a/themes/grav/templates/partials/themes-list.html.twig
+++ b/themes/grav/templates/partials/themes-list.html.twig
@@ -5,8 +5,7 @@
 </h1>
 
 <div class="themes card-row grid fixed-blocks pure-g">
-    {% for slug, package in admin.themes(not installing) %}
-        {% set theme = package.toArray() %}
+    {% for slug, theme in admin.themes(not installing).toArray|ksort %}
         {% set state = 'inactive' %}
         {% if (installing) %}{% set state = 'installing' %}{% endif %}
         {% if (config.get('system.pages.theme') == slug) %}{% set state = 'active' %}{% endif %}