diff --git a/libraries/classes/Controllers/Database/DesignerController.php b/libraries/classes/Controllers/Database/DesignerController.php
index 50a1477b48..8eb880f2da 100644
--- a/libraries/classes/Controllers/Database/DesignerController.php
+++ b/libraries/classes/Controllers/Database/DesignerController.php
@@ -165,7 +165,9 @@ class DesignerController extends AbstractController
         $display_page = -1;
         $selected_page = null;
 
-        if (isset($_GET['query'])) {
+        $visualBuilderMode = isset($_GET['query']);
+
+        if ($visualBuilderMode) {
             $display_page = $this->designerCommon->getDefaultPage($_GET['db']);
         } elseif (! empty($_GET['page'])) {
             $display_page = $_GET['page'];
@@ -242,7 +244,7 @@ class DesignerController extends AbstractController
                 $script_contr,
                 $script_display_field,
                 $display_page,
-                isset($_GET['query']),
+                $visualBuilderMode,
                 $selected_page,
                 $classes_side_menu,
                 $tab_pos,
diff --git a/libraries/classes/Database/Designer.php b/libraries/classes/Database/Designer.php
index ce6b596698..2fa6e7deaa 100644
--- a/libraries/classes/Database/Designer.php
+++ b/libraries/classes/Database/Designer.php
@@ -311,7 +311,7 @@ class Designer
      * @param array           $scriptContr          initialization data array
      * @param DesignerTable[] $scriptDisplayField   displayed tables in designer with their display fields
      * @param int             $displayPage          page number of the selected page
-     * @param bool            $hasQuery             whether this is visual query builder
+     * @param bool            $visualBuilderMode    whether this is visual query builder
      * @param string          $selectedPage         name of the selected page
      * @param array           $paramsArray          array with class name for various buttons on side menu
      * @param array|null      $tabPos               table positions
@@ -329,7 +329,7 @@ class Designer
         array $scriptContr,
         array $scriptDisplayField,
         $displayPage,
-        $hasQuery,
+        bool $visualBuilderMode,
         $selectedPage,
         array $paramsArray,
         ?array $tabPos,
@@ -391,7 +391,8 @@ class Designer
             'get_db' => $getDb,
             'designer_config' => json_encode($designerConfig),
             'display_page' => (int) $displayPage,
-            'has_query' => $hasQuery,
+            'has_query' => $visualBuilderMode,
+            'visual_builder' => $visualBuilderMode,
             'selected_page' => $selectedPage,
             'params_array' => $paramsArray,
             'theme' => $GLOBALS['PMA_Theme'],