diff --git a/source/table_editor.pas b/source/table_editor.pas
index 79bb9572..4863a16d 100644
--- a/source/table_editor.pas
+++ b/source/table_editor.pas
@@ -372,8 +372,13 @@ end;
 
 procedure TfrmTableEditor.btnSaveClick(Sender: TObject);
 begin
+  // Save changes, and make it impossible to (accidentally) click the save button twice
+  btnSave.Enabled := False;
+  btnSave.Repaint;
   if ApplyModifications = mrOK then
-    Init(DBObject);
+    Init(DBObject)
+  else // Re-enable save button when something went wrong
+    btnSave.Enabled := True;
 end;