diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 52fe2cf058..0244247e5a 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -15708,7 +15708,7 @@ parameters:
 		-
 			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
 			identifier: empty.notAllowed
-			count: 3
+			count: 2
 			path: src/ResponseRenderer.php
 
 		-
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index acbab945c9..df386581b5 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -9313,7 +9313,6 @@
       <code><![CDATA[DatabaseInterface::getInstance()]]></code>
     </DeprecatedMethod>
     <InvalidArrayOffset>
-      <code><![CDATA[$GLOBALS['focus_querywindow']]]></code>
       <code><![CDATA[$GLOBALS['reload']]]></code>
     </InvalidArrayOffset>
     <MixedArgumentTypeCoercion>
diff --git a/src/ResponseRenderer.php b/src/ResponseRenderer.php
index 0f2da1f95d..a190c60708 100644
--- a/src/ResponseRenderer.php
+++ b/src/ResponseRenderer.php
@@ -305,9 +305,6 @@ class ResponseRenderer
                 'reloadQuerywindow',
                 ['db' => Current::$database, 'table' => Current::$table, 'sql_query' => $query],
             );
-            if (! empty($GLOBALS['focus_querywindow'])) {
-                $this->addJSON('_focusQuerywindow', $query);
-            }
 
             if (! empty($GLOBALS['reload'])) {
                 $this->addJSON('reloadNavigation', 1);
diff --git a/tests/unit/FooterTest.php b/tests/unit/FooterTest.php
index e5d9a01f5d..26bc694bc5 100644
--- a/tests/unit/FooterTest.php
+++ b/tests/unit/FooterTest.php
@@ -44,7 +44,6 @@ class FooterTest extends AbstractTestCase
         $config->selectedServer['DisableIS'] = false;
         $config->selectedServer['verbose'] = 'verbose host';
         $_GET['reload_left_frame'] = '1';
-        $GLOBALS['focus_querywindow'] = 'main_pane_left';
         $this->object = new Footer(new Template(), $config);
         Current::$sqlQuery = '';
         $_POST = [];