diff --git a/core/src/client/AuthenticationConfiguration/AuthenticationConfiguration.tsx b/core/src/client/AuthenticationConfiguration/AuthenticationConfiguration.tsx
index 36eb0b962d3..4219594f2ff 100644
--- a/core/src/client/AuthenticationConfiguration/AuthenticationConfiguration.tsx
+++ b/core/src/client/AuthenticationConfiguration/AuthenticationConfiguration.tsx
@@ -212,7 +212,7 @@ class AuthenticationConfiguration extends PureComponent<{}, Partial<State>> {
                 const oldOrdering = state.dirtinessData[configType];
                 return !isEquivalent(newOrdering, oldOrdering);
             });
-            const dirty = dirtyStateAreas.length > 0 || !isEquivalent({ ...globalSettings }, dirtinessData);
+            const dirty = dirtyStateAreas.length > 0 || !isEquivalent({ ...globalSettings }, dirtinessData.globalSettings);
 
             return { ...newState, dirty };
         });
diff --git a/devtools/test/src/org/labkey/test/tests/devtools/AuthenticationProviderReorderTest.java b/devtools/test/src/org/labkey/test/tests/devtools/AuthenticationProviderReorderTest.java
index c80d8d92888..9d396181944 100644
--- a/devtools/test/src/org/labkey/test/tests/devtools/AuthenticationProviderReorderTest.java
+++ b/devtools/test/src/org/labkey/test/tests/devtools/AuthenticationProviderReorderTest.java
@@ -70,12 +70,11 @@ public void testReorderConfigurations()
         assertSsoLinkOrder(config_uncool, config_cool);
         simpleSignIn();
 
-        configurePage = LoginConfigurePage.beginAt(this);
-        WebElement uncoolRow = Locator.byClass("domain-row-handle").findElement(configurePage.getPrimaryConfigurationRow(config_uncool));
-        WebElement coolRow = Locator.byClass("domain-row-handle").findElement(configurePage.getPrimaryConfigurationRow(config_cool));
-        dragAndDrop(uncoolRow, coolRow);
-        BootstrapLocators.infoBanner.waitForElement(getDriver(), 2_000);
-        configurePage.clickSaveAndFinish();
+        LoginConfigurePage reorderPage = LoginConfigurePage.beginAt(this);
+        keyboardDragAndDrop(reorderPage.getPrimaryConfigurationRow(config_uncool).getDragHandle(),
+                reorderPage.getPrimaryConfigurationRow(config_cool).getDragHandle());
+        waitFor(() -> BootstrapLocators.infoBanner.existsIn(getDriver()), "Configurations were not reordered", 2_000);
+        reorderPage.clickSaveAndFinish();
 
         signOut();
         assertSsoLinkOrder(config_cool, config_uncool);