diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt
index e85f9a6e2..e4d9c64a9 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt
@@ -182,6 +182,8 @@ fun PositionConfigItemList(
                 enabled = positionInput != positionConfig || locationInput != location,
                 onCancelClicked = {
                     focusManager.clearFocus()
+                    locationInput = location
+                    positionInput = positionConfig
                 },
                 onSaveClicked = {
                     focusManager.clearFocus()