diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 77fbd514be..f3fbcbe986 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -15882,7 +15882,7 @@ parameters:
 				Use dependency injection instead\.$#
 			'''
 			identifier: staticMethod.deprecated
-			count: 2
+			count: 1
 			path: tests/unit/Database/RoutinesTest.php
 
 		-
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 5f78b2f30d..361c6d5a03 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -10022,7 +10022,6 @@
   </file>
   <file src="tests/unit/Database/RoutinesTest.php">
     <DeprecatedMethod>
-      <code><![CDATA[Config::getInstance()]]></code>
       <code><![CDATA[Config::getInstance()]]></code>
       <code><![CDATA[DatabaseInterface::getInstance()]]></code>
       <code><![CDATA[DatabaseInterface::getInstance()]]></code>
diff --git a/src/Controllers/Table/ChangeController.php b/src/Controllers/Table/ChangeController.php
index 83f3973786..48a05edb3b 100644
--- a/src/Controllers/Table/ChangeController.php
+++ b/src/Controllers/Table/ChangeController.php
@@ -97,6 +97,20 @@ class ChangeController implements InvocableController
             }
         }
 
+        if ($request->hasBodyParam('ShowFunctionFields')) {
+            $this->config->set(
+                'ShowFunctionFields',
+                $request->getParsedBodyParam('ShowFunctionFields') === '1',
+            );
+        }
+
+        if ($request->hasBodyParam('ShowFieldTypesInDataEditView')) {
+            $this->config->set(
+                'ShowFieldTypesInDataEditView',
+                $request->getParsedBodyParam('ShowFieldTypesInDataEditView') === '1',
+            );
+        }
+
         /**
          * Determine whether Insert or Edit and set global variables
          */
@@ -205,9 +219,7 @@ class ChangeController implements InvocableController
 
         // user can toggle the display of Function column and column types
         // (currently does not work for multi-edits)
-        if (
-            ! $this->config->config->ShowFunctionFields || ! $this->config->config->ShowFieldTypesInDataEditView
-        ) {
+        if (! $this->config->config->ShowFunctionFields || ! $this->config->config->ShowFieldTypesInDataEditView) {
             $htmlOutput .= __('Show');
         }
 
diff --git a/src/InsertEdit.php b/src/InsertEdit.php
index 4b71967d7b..3801a5091b 100644
--- a/src/InsertEdit.php
+++ b/src/InsertEdit.php
@@ -1345,14 +1345,6 @@ class InsertEdit
             $afterInsert = 'edit_next';
         }
 
-        if (isset($_POST['ShowFunctionFields'])) {
-            $this->config->set('ShowFunctionFields', $_POST['ShowFunctionFields'] === '1');
-        }
-
-        if (isset($_POST['ShowFieldTypesInDataEditView'])) {
-            $this->config->set('ShowFieldTypesInDataEditView', $_POST['ShowFieldTypesInDataEditView'] === '1');
-        }
-
         if (isset($_POST['after_insert'])) {
             $afterInsert = $_POST['after_insert'];
         }
diff --git a/tests/unit/Controllers/Table/ChangeControllerTest.php b/tests/unit/Controllers/Table/ChangeControllerTest.php
index 1415704251..54e42eaeaa 100644
--- a/tests/unit/Controllers/Table/ChangeControllerTest.php
+++ b/tests/unit/Controllers/Table/ChangeControllerTest.php
@@ -54,8 +54,6 @@ final class ChangeControllerTest extends AbstractTestCase
 
         $config = Config::getInstance();
         $config->set('InsertRows', 3);
-        $config->set('ShowFunctionFields', true);
-        $config->set('ShowFieldTypesInDataEditView', true);
 
         $relation = new Relation($dbi);
         $template = new Template();
diff --git a/tests/unit/Database/RoutinesTest.php b/tests/unit/Database/RoutinesTest.php
index 4a971e88ef..8b08d3b9ab 100644
--- a/tests/unit/Database/RoutinesTest.php
+++ b/tests/unit/Database/RoutinesTest.php
@@ -237,8 +237,6 @@ class RoutinesTest extends AbstractTestCase
     public function testGetQueryFromRequest(array $request, string $query, int $numErr): void
     {
         $config = Config::getInstance();
-        $config->set('ShowFunctionFields', false);
-
         $oldDbi = DatabaseInterface::getInstance();
         $dbi = $this->getMockBuilder(DatabaseInterface::class)
             ->disableOriginalConstructor()
diff --git a/tests/unit/InsertEditTest.php b/tests/unit/InsertEditTest.php
index 6e04788ac0..5303184df6 100644
--- a/tests/unit/InsertEditTest.php
+++ b/tests/unit/InsertEditTest.php
@@ -2208,8 +2208,6 @@ class InsertEditTest extends AbstractTestCase
         DatabaseInterface::$instance = $dbi;
         $_POST['where_clause'] = '1';
         $_SESSION['edit_next'] = '1';
-        $_POST['ShowFunctionFields'] = true;
-        $_POST['ShowFieldTypesInDataEditView'] = true;
         $_POST['after_insert'] = 'edit_next';
         $_POST['default_action'] = 'insert';