diff --git a/Resources/CellTypes/Base.ts b/Resources/CellTypes/Base.ts
index 488d41e862dadfd23c477bb9557bf7e446c4d3fb..dc394616803acdb3e225906dccca64810c89b9dd 100644
--- a/Resources/CellTypes/Base.ts
+++ b/Resources/CellTypes/Base.ts
@@ -426,6 +426,7 @@
 
     export interface IInputCellTypeBaseParam {
         TabIndex: number;
+        DisableTabOrder?: boolean;
     }
 
     export class InputCellTypeBase<T = object> extends ElementCellTypeBase<T> {
@@ -451,7 +452,7 @@
             }
             if (this.shouldEnableTabIndex()) {
                 const inputCellType = <any>this.cellType as IInputCellTypeBaseParam;
-                $('button, input, a, textarea', `#${this.ID}`).attr("tabindex", inputCellType.TabIndex);
+                $('button, input, a, textarea', `#${this.ID}`).attr("tabindex", inputCellType.DisableTabOrder ? -1 : inputCellType.TabIndex);
             }
         }
     }