diff --git a/apps/table-test/src/app/app.component.html b/apps/table-test/src/app/app.component.html
index 5a115e12..962969d1 100644
--- a/apps/table-test/src/app/app.component.html
+++ b/apps/table-test/src/app/app.component.html
@@ -52,6 +52,9 @@
 			<ng-template #headerTmpl> Amount </ng-template>
 		</ngx-currency-table-cell>
 
+		<ngx-date-table-cell column="date">
+		</ngx-date-table-cell>
+
 		<ngx-table-cell column="button">
 			<ng-template #cellTmpl>
 				<button>Button 1</button>
diff --git a/apps/table-test/src/app/app.component.ts b/apps/table-test/src/app/app.component.ts
index 3cf8d276..2aa3097c 100644
--- a/apps/table-test/src/app/app.component.ts
+++ b/apps/table-test/src/app/app.component.ts
@@ -31,6 +31,7 @@ export class AppComponent {
 			id: 'id1',
 			hello: 'world',
 			amount: 37,
+			date: '12/02/2023',
 		},
 		{
 			name: 'Hyperdrive',
@@ -39,6 +40,7 @@ export class AppComponent {
 			id: 'SHD',
 			hello: 'world',
 			amount: 5000,
+			date: '12/02/2023',
 		},
 		{
 			name: 'Hyperdrive',
@@ -47,6 +49,7 @@ export class AppComponent {
 			id: 'SHD2',
 			hello: 'world',
 			amount: 5000,
+			date: '12/02/2023',
 		},
 	];
 
@@ -58,12 +61,13 @@ export class AppComponent {
 			id: 'id3',
 			hello: 'world',
 			amount: 0.5,
+			date: '12/02/2023',
 		},
 	];
 
 	public data = new BehaviorSubject(this.dataSet1);
 
-	public readonly columns = ['firstName', 'name', 'button', 'amount', 'active'];
+	public readonly columns = ['firstName', 'name', 'date', 'button', 'amount', 'active'];
 
 	public showDetail = true;
 
diff --git a/libs/table/src/lib/directives/tree-grid/tree-grid.cell.directive.ts b/libs/table/src/lib/directives/tree-grid/tree-grid.cell.directive.ts
index 13b2a1ab..3af78c0d 100644
--- a/libs/table/src/lib/directives/tree-grid/tree-grid.cell.directive.ts
+++ b/libs/table/src/lib/directives/tree-grid/tree-grid.cell.directive.ts
@@ -158,7 +158,7 @@ export class NgxTreeGridCellDirective extends NgxHasFocusDirective {
 				element.focus();
 
 				// Iben: If the current active element is the same as the element we focussed, on, we break
-				if (this.elementRef.nativeElement !== document?.activeElement) {
+				if (element === document?.activeElement) {
 					result = element;
 					this.hasFocus = true;