From d802b97fe894b0203edf280f8c192bb790c5413f Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Fri, 30 Jun 2017 21:11:56 +0200
Subject: [PATCH] Add check before resetting folder

---
 classes/admincontroller.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/classes/admincontroller.php b/classes/admincontroller.php
index 00b43134..1c710594 100644
--- a/classes/admincontroller.php
+++ b/classes/admincontroller.php
@@ -461,8 +461,10 @@ class AdminController extends AdminBaseController
             /** @var Page $obj */
             $obj = $this->admin->page(true);
 
-            $data['folder'] = $obj->slug();
-            $this->data['folder'] = $obj->slug();
+            if (!$data['folder']) {
+                $data['folder'] = $obj->slug();
+                $this->data['folder'] = $obj->slug();
+            }
 
             // Ensure route is prefixed with a forward slash.
             $route = '/' . ltrim($route, '/');