diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/customfields/list/CustomFieldsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/customfields/list/CustomFieldsScreen.kt
index f2e60b578e3..a260613073a 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/customfields/list/CustomFieldsScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/customfields/list/CustomFieldsScreen.kt
@@ -122,12 +122,11 @@ private fun CustomFieldsScreen(
                 title = stringResource(id = R.string.custom_fields_list_title),
                 onNavigationButtonClick = onBackClick,
                 actions = {
-                    if (state.hasChanges) {
-                        WCTextButton(
-                            text = stringResource(id = R.string.save),
-                            onClick = onSaveClicked
-                        )
-                    }
+                    WCTextButton(
+                        text = stringResource(id = R.string.save),
+                        onClick = onSaveClicked,
+                        enabled = state.hasChanges
+                    )
                 }
             )
         },