diff --git a/public/theme/skeleton/partials/_aside.twig b/public/theme/skeleton/partials/_aside.twig
index 623b58af3..631cd28c9 100644
--- a/public/theme/skeleton/partials/_aside.twig
+++ b/public/theme/skeleton/partials/_aside.twig
@@ -55,14 +55,16 @@
         {% setcontent records = ct.slug ~ "/latest/3" %}
 
         <h5>{{ __('contenttypes.generic.recent', {'%contenttypes%': ct.name}) }}</h5>
-        <ul>
-            {% for record in records %}
-                <li><a href="{{ record|link }}">{{ record|title }}</a></li>
-            {% else %}
-                <li>{{ __('contenttypes.generic.no-recent', {'%contenttype%': ct.slug}) }}</li>
-            {% endfor %}
-        </ul>
-        <p><a href="{{ path('listing', {'contentTypeSlug': ct.slug}) }}">{{ __('contenttypes.generic.overview',{'%contenttypes%': ct.name}) }} &raquo;</a></p>
+        {% if records|length %}
+            <ul>
+                {% for record in records %}
+                    <li><a href="{{ record|link }}">{{ record|title }}</a></li>
+                {% endfor %}
+            </ul>
+            <p><a href="{{ path('listing', {'contentTypeSlug': ct.slug}) }}">{{ __('contenttypes.generic.overview',{'%contenttypes%': ct.name}) }} &raquo;</a></p>
+        {% else %}
+            <p>{{ __('contenttypes.generic.no-recent', {'%contenttype%': ct.slug}) }}</p>
+        {% endif %}
 
     {% endfor %}
 
diff --git a/templates/content/_buttons.html.twig b/templates/content/_buttons.html.twig
index 314e887fe..c43d7ec9a 100644
--- a/templates/content/_buttons.html.twig
+++ b/templates/content/_buttons.html.twig
@@ -33,7 +33,7 @@
 
         <hr>
         <div class="form-fieldsgroup__summary-fields">
-        {% if record.status == "published" and record.definition.viewless != true %}
+        {% if record.status == "published" and record|link(true) %}
             <a href="{{ record|link(true) }}" class="btn btn-tertiary btn-sm" target="_blank">{{ macro.icon('fa-sign-out-alt') }} {{ __('action.view_saved') }}</a>
         {% endif %}
             <a href="{{ record.extras.deleteLink }}" class='action-remove-collection-item btn btn-sm btn-hidden-danger' data-confirmation="{{ 'action.confirm_delete'|trans }}">