diff --git a/src/ng2-smart-table/components/tbody/tbody.component.html b/src/ng2-smart-table/components/tbody/tbody.component.html
index 2c7f899b9..414e63bbc 100644
--- a/src/ng2-smart-table/components/tbody/tbody.component.html
+++ b/src/ng2-smart-table/components/tbody/tbody.component.html
@@ -13,7 +13,7 @@
                               [source]="source">
     </ng2-st-tbody-edit-delete>
   </td>
-  <td *ngIf="row.isInEditing" class="ng2-smart-actions">
+   <td *ngIf="row.isInEditing && grid.showActionColumn('left')"  class="ng2-smart-actions">
     <ng2-st-tbody-create-cancel [grid]="grid" [row]="row" [editConfirm]="editConfirm"></ng2-st-tbody-create-cancel>
   </td>
   <td *ngFor="let cell of row.getCells()">
@@ -27,6 +27,11 @@
                           [isInEditing]="row.isInEditing">
     </ng2-smart-table-cell>
   </td>
+  
+  <td *ngIf="row.isInEditing && grid.showActionColumn('right')"  class="ng2-smart-actions">
+    <ng2-st-tbody-create-cancel [grid]="grid" [row]="row" [editConfirm]="editConfirm"></ng2-st-tbody-create-cancel>
+  </td>
+  
   <td *ngIf="!row.isInEditing && grid.showActionColumn('right')" class="ng2-smart-actions">
     <ng2-st-tbody-edit-delete [grid]="grid"
                               [deleteConfirm]="deleteConfirm"
diff --git a/src/ng2-smart-table/components/thead/rows/thead-form-row.component.ts b/src/ng2-smart-table/components/thead/rows/thead-form-row.component.ts
index 3dc49c290..6e93fe01c 100644
--- a/src/ng2-smart-table/components/thead/rows/thead-form-row.component.ts
+++ b/src/ng2-smart-table/components/thead/rows/thead-form-row.component.ts
@@ -7,7 +7,7 @@ import { Row } from '../../../lib/data-set/row';
   selector: '[ng2-st-thead-form-row]',
   template: `
       <td *ngIf="grid.isMultiSelectVisible()"></td>
-      <td class="ng2-smart-actions">
+      <td  *ngIf= "grid.showActionColumn('left')"  class="ng2-smart-actions">
         <ng2-st-actions [grid]="grid" (create)="onCreate($event)"></ng2-st-actions>
       </td>
       <td *ngFor="let cell of grid.getNewRow().getCells()">
@@ -20,6 +20,9 @@ import { Row } from '../../../lib/data-set/row';
                               (edited)="onCreate($event)">
         </ng2-smart-table-cell>
       </td>
+      <td  *ngIf= "grid.showActionColumn('right')"  class="ng2-smart-actions">
+        <ng2-st-actions [grid]="grid" (create)="onCreate($event)"></ng2-st-actions>
+      </td>
   `,
 })
 export class TheadFormRowComponent {