diff --git a/CHANGELOG.md b/CHANGELOG.md
index b63cb220..e47b24ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
     * Fix issue with update button when automatic check for updates is disabled
     * Fix issue caused by clicking "Check for updates" multiple times
     * Added missing translations
+    * Fix for Themes with an array of keywords [#823](https://github.com/getgrav/grav/issues/823)
 
 # v1.1.0-beta.3
 ## 05/04/2016
diff --git a/themes/grav/templates/partials/themes-details.html.twig b/themes/grav/templates/partials/themes-details.html.twig
index b59adda8..0fbcf580 100644
--- a/themes/grav/templates/partials/themes-details.html.twig
+++ b/themes/grav/templates/partials/themes-details.html.twig
@@ -63,7 +63,9 @@
         {% if theme.keywords %}
             <tr>
                 <td>{{ "PLUGIN_ADMIN.KEYWORDS"|tu }}:</td>
-                <td class="double">{{ theme.keywords }}</td>
+                <td class="double">
+                   {{ theme.keywords|join(', ') }}
+                </td>
             </tr>
         {% endif %}
         {% if theme.license %}
@@ -106,4 +108,4 @@
 {% endif %}
 
 {% include 'partials/modal-changes-detected.html.twig' %}
-{% include 'partials/modal-remove-package.html.twig' with { type: 'theme', package: theme } %}
\ No newline at end of file
+{% include 'partials/modal-remove-package.html.twig' with { type: 'theme', package: theme } %}