diff --git a/src/MaterialEditor.Base/UI/UI.ListEntry.cs b/src/MaterialEditor.Base/UI/UI.ListEntry.cs
index 07b2c6e5..3469e444 100644
--- a/src/MaterialEditor.Base/UI/UI.ListEntry.cs
+++ b/src/MaterialEditor.Base/UI/UI.ListEntry.cs
@@ -611,8 +611,9 @@ void onChanged(Color c)
                     case ItemInfo.RowItemType.KeywordProperty:
                         ShowKeyword();
                         SetLabelText(KeywordLabel, item.LabelText, item.KeywordValue != item.KeywordValueOriginal);
-                        KeywordToggle.isOn = item.KeywordValue;
                         KeywordToggle.onValueChanged.RemoveAllListeners();
+
+                        KeywordToggle.isOn = item.KeywordValue;
                         KeywordToggle.onValueChanged.AddListener(value =>
                         {
                             item.KeywordValue = value;