diff --git a/pywr_editor/form/widgets/abstract_model_component_list_picker_widget.py b/pywr_editor/form/widgets/abstract_model_component_list_picker_widget.py
index dcfcb38..91ce886 100644
--- a/pywr_editor/form/widgets/abstract_model_component_list_picker_widget.py
+++ b/pywr_editor/form/widgets/abstract_model_component_list_picker_widget.py
@@ -361,6 +361,11 @@ def on_form_save(
         # noinspection PyUnresolvedReferences
         self.model.layoutChanged.emit()
 
+        # disable buttons on change
+        self.move_up.setEnabled(False)
+        self.move_down.setEnabled(False)
+        self.delete_button.setEnabled(False)
+
     def sanitise_value(
         self, value: list[int | float | str | dict]
     ) -> [list[dict | str], str | None]: