diff --git a/application/controllers/EditorLinkController.php b/application/controllers/EditorLinkController.php
index b81b09379a9..fafd357a5b7 100644
--- a/application/controllers/EditorLinkController.php
+++ b/application/controllers/EditorLinkController.php
@@ -51,9 +51,13 @@ public function accessRules()
     public function run($action)
     {
         $this->setAuthInitCookie();
-        $route = Yii::app()->request->getQuery('route');
-        $path = static::REACT_APP_BASE_PATH . $route;
-        $url = Yii::app()->request->baseUrl . $path;
+        $editorUrl = Yii::app()->request->getQuery(
+            'url',
+            Yii::app()->request->baseUrl
+                . static::REACT_APP_BASE_PATH
+        );
+        $editorRoute = Yii::app()->request->getQuery('route');
+        $url = $editorUrl . $editorRoute;
         $this->redirect($url);
     }