diff --git a/source/grideditlinks.pas b/source/grideditlinks.pas
index 9d8e7aa3..32ecf476 100644
--- a/source/grideditlinks.pas
+++ b/source/grideditlinks.pas
@@ -1103,13 +1103,13 @@ end;
 function GetColumnDefaultClause(DefaultType: TColumnDefaultType; Text: WideString): WideString;
 begin
   case DefaultType of
-    cdtText:           Result := ' DEFAULT '+esc(Text);
-    cdtTextUpdateTS:   Result := ' DEFAULT '+esc(Text)+' ON UPDATE CURRENT_TIMESTAMP';
-    cdtNull:           Result := ' DEFAULT NULL';
-    cdtNullUpdateTS:   Result := ' DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP';
-    cdtCurTS:          Result := ' DEFAULT CURRENT_TIMESTAMP';
-    cdtCurTSUpdateTS:  Result := ' DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP';
-    cdtAutoInc:        Result := ' AUTO_INCREMENT';
+    cdtText:           Result := 'DEFAULT '+esc(Text);
+    cdtTextUpdateTS:   Result := 'DEFAULT '+esc(Text)+' ON UPDATE CURRENT_TIMESTAMP';
+    cdtNull:           Result := 'DEFAULT NULL';
+    cdtNullUpdateTS:   Result := 'DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP';
+    cdtCurTS:          Result := 'DEFAULT CURRENT_TIMESTAMP';
+    cdtCurTSUpdateTS:  Result := 'DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP';
+    cdtAutoInc:        Result := 'AUTO_INCREMENT';
   end;
 end;
 
diff --git a/source/table_editor.pas b/source/table_editor.pas
index ab096e76..6417c07c 100644
--- a/source/table_editor.pas
+++ b/source/table_editor.pas
@@ -654,6 +654,7 @@ begin
   end;
 
   Result := 'ALTER TABLE '+Mainform.mask(FAlterTableName) + CRLF + #9 + ImplodeStr(',' + CRLF + #9, Specs);
+  Result := Trim(Result);
   FreeAndNil(Specs);
   FreeAndNil(IndexesComposed);
   FreeAndNil(OldIndexesComposed);
@@ -728,7 +729,7 @@ begin
     Result := Result + 'UNION=('+memoUnionTables.Text+')' + CRLF;
   if comboInsertMethod.Enabled and (comboInsertMethod.Text <> '') then
     Result := Result + 'INSERT_METHOD='+comboInsertMethod.Text + CRLF;
-
+  Result := Trim(Result);
 end;