diff --git a/app/controllers/admin/configuration.php b/app/controllers/admin/configuration.php
index 1e6b3c352fe76e5f13180d64d7ae695fd4f4bf33..4cfc0a3cd96c001292a528a97c57db3a31954377 100644
--- a/app/controllers/admin/configuration.php
+++ b/app/controllers/admin/configuration.php
@@ -36,6 +36,12 @@ class Admin_ConfigurationController extends AuthenticatedController
         }
 
         $this->setupSidebar($this->range_type);
+
+        // Preserve section parameter
+        // This *must* be after the sidebar has been defined
+        if (!Request::isPost() && Request::submitted('section')) {
+            URLHelper::addLinkParam('section', Request::option('section'));
+        }
     }
 
     /**
@@ -61,7 +67,7 @@ class Admin_ConfigurationController extends AuthenticatedController
 
         // set variables for view
         $this->only_section = $section;
-        $this->open_section = $open_section ?: $section;
+        $this->open_section = $open_section ?? $section;
         $this->needle = $needle;
         $this->sections = ConfigurationModel::getConfig($section, $needle);
 
@@ -97,7 +103,7 @@ class Admin_ConfigurationController extends AuthenticatedController
                     htmlReady($field)
                 ));
 
-                $this->relocate('admin/configuration/configuration/' . $section);
+                $this->relocate("admin/configuration/configuration/{$section}#field-{$field}");
                 return;
             }
         }
diff --git a/app/views/admin/configuration/table-row.php b/app/views/admin/configuration/table-row.php
index fd57331171aa5c1b0e52ddf81a6e8f9167503817..ef161e30cf1394decf01408f0364f400f81357f5 100644
--- a/app/views/admin/configuration/table-row.php
+++ b/app/views/admin/configuration/table-row.php
@@ -1,4 +1,4 @@
-<tr>
+<tr id="field-<?= htmlReady($field) ?>">
     <td>
         <a data-dialog href="<?= $controller->link_for($linkchunk, compact('field')) ?>">
             <?= htmlReady($field) ?>