diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig
index b3d83400..f0da016c 100644
--- a/themes/grav/templates/pages.html.twig
+++ b/themes/grav/templates/pages.html.twig
@@ -49,30 +49,35 @@
     {% set admin_lang = twig_vars['admin_lang'] %}
     {% set warn = twig_vars['warn'] %}
 
+
+
     {% for p in page.children() %}
         {% set description = (not p.page ? 'Folder • ' : 'Page • ') ~
                              (p.modular ? 'Modular • ' : '') ~
                              (p.routable ? 'Routable • ' : 'Not Routable • ') ~
                              (p.visible ? 'Visible • ' : 'Not Visible • ') %}
+        {% set page_route =  p.rawRoute|trim('/') %}
+        {% if p.language and p.language != admin_lang %}
+            {% set page_url = base_url_simple ~ '/' ~ p.language ~ '/' ~ admin_route ~ '/pages/' ~ page_route %}
+        {% else %}
+            {% set page_url = base_url ~ '/pages/' ~ page_route  %}
+        {% endif %}
 
         <li class="page-item" data-nav-id="{{ p.route }}">
             <div class="row">
                 <span {{ p.children(0).count > 0 ? 'data-toggle="children"' : ''}} data-hint="{{ description|trim(' &bull; ') }}" class="hint--bottom">
                 <i class="page-icon fa fa-fw fa-circle-o {{ p.children(0).count > 0 ? 'children-closed' : ''}} {{ p.modular ? 'modular' : (not p.routable ? 'not-routable' : (not p.visible ? 'not-visible' : (not p.page ? 'folder' :  ''))) }}"></i>
                 </span>
-                {% if p.language == admin_lang %}
-                    <a href="{{ base_url }}/pages/{{ (p.header.routes.default ?: p.rawRoute)|trim('/') }}" class="page-edit">{{ p.menu }}</a>
-                {% else %}
-                    <a href="{{ base_url_simple }}/{{ p.language }}/{{ admin_route }}/pages/{{ (p.header.routes.default ?: p.rawRoute)|trim('/') }}" class="page-edit">{{ p.menu }}</a> <span class="badge lang">{{p.language ?: default_site_lang}}</span>
+                <a href="{{ page_url }}" class="page-edit">{{ p.menu }}</a>
+                {% if p.language and p.language != admin_lang %}
+                    <span class="badge lang">{{p.language ?: default_site_lang}}</span>
                 {% endif %}
                 <span class="page-home">{{ p.home ? '<i class="fa fa-home"></i>' }}</span>
                 <span class="page-tools">
-                    {% if p.language == admin_lang %}
-                        {% if warn %}
-                        <a href="#delete" data-remodal-target="delete" data-delete-url="{{ base_url }}/pages/{{ p.rawRoute|trim('/') }}/task{{ separator }}delete" class="page-delete" ><i class="fa fa-close"></i></a>
-                        {% else %}
-                        <a href="{{ base_url }}/pages/{{ p.rawRoute|trim('/') }}/task{{ separator }}delete" class="page-delete" ><i class="fa fa-close"></i></a>
-                        {% endif %}
+                    {% if warn %}
+                    <a href="#delete" data-remodal-target="delete" data-delete-url="{{ page_url }}/task{{ separator }}delete" class="page-delete" ><i class="fa fa-close"></i></a>
+                    {% else %}
+                    <a href="{{ page_url }}/task{{ separator }}delete" class="page-delete" ><i class="fa fa-close"></i></a>
                     {% endif %}
                 </span>
                 <p class="page-route">{{ p.header.routes.default ?: p.route }}</p>