diff --git a/themes/grav/js/pages-all.js b/themes/grav/js/pages-all.js
index 835f4ca8..204345e0 100644
--- a/themes/grav/js/pages-all.js
+++ b/themes/grav/js/pages-all.js
@@ -44,11 +44,12 @@ $(function(){
     });
 
     $("#admin-mode-toggle input[name=mode-switch]").on('change', function(e){
-        var value = $(this).val();
+        var value = $(this).val(),
+            uri   = $(this).data('leave-url');
 
         if (currentValues == getState()) {
             setTimeout(function(){
-                window.location.href = '{{ uri.route(true) }}' + ((value == 'expert') ? '/expert:1' : '');
+                window.location.href = uri;
             }, 200)
 
             return true;
diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig
index 8636c5e8..38db503f 100644
--- a/themes/grav/templates/pages.html.twig
+++ b/themes/grav/templates/pages.html.twig
@@ -98,9 +98,9 @@
             {% if context.blueprints.fields %}
             <form id="admin-mode-toggle">
                 <div class="switch-toggle switch-grav">
-                    <input type="radio" value="normal" id="normal" name="mode-switch" class="highlight" {% if not uri.param('expert') %} checked="checked"{% endif %}>
+                    <input type="radio" value="normal" data-leave-url="{{ uri.route(true) }}" id="normal" name="mode-switch" class="highlight" {% if not uri.param('expert') %} checked="checked"{% endif %}>
                     <label for="normal">Normal</label>
-                    <input type="radio" value="expert" id="expert" name="mode-switch" class="highlight" {% if uri.param('expert') %} checked="checked"{% endif %}>
+                    <input type="radio" value="expert" data-leave-url="{{ uri.route(true) }}/expert:1" id="expert" name="mode-switch" class="highlight" {% if uri.param('expert') %} checked="checked"{% endif %}>
                     <label for="expert">Expert</label>
                     <a></a>
                 </div>