diff --git a/lib/core/datatable/components/datatable/datatable.component.html b/lib/core/datatable/components/datatable/datatable.component.html
index a2e1161466..fdc0ac2326 100644
--- a/lib/core/datatable/components/datatable/datatable.component.html
+++ b/lib/core/datatable/components/datatable/datatable.component.html
@@ -42,7 +42,6 @@
                 </mat-option>
             </mat-select>
         </mat-form-field>
-
     </div>
 
     <div class="adf-datatable-body">
@@ -191,6 +190,9 @@
                     <ng-content select="adf-empty-list"></ng-content>
                 </div>
             </div>
+            <div *ngFor="let row of fakeRows"
+                 class="adf-datatable-row adf-datatable-row-empty-card">
+            </div>
         </ng-container>
         <div *ngIf="!loading && noPermission"
              [class.adf-datatable-row]="display === 'list'"
diff --git a/lib/core/datatable/components/datatable/datatable.component.scss b/lib/core/datatable/components/datatable/datatable.component.scss
index bb6e230b13..61a0a61c9d 100644
--- a/lib/core/datatable/components/datatable/datatable.component.scss
+++ b/lib/core/datatable/components/datatable/datatable.component.scss
@@ -29,13 +29,10 @@
             display: flex;
 
             width: 100%;
-            flex-direction: row;
-            justify-content: space-between;
 
-            &:after {
-                content: "";
-                flex: auto;
-            }
+            justify-content: space-evenly;
+            align-content: flex-start;
+            align-items: flex-start;
 
             .adf-datatable-row {
                 transition: all 0.3s ease;
@@ -58,6 +55,14 @@
                 @include mat-overridable-elevation(2);
             }
 
+            .adf-datatable-row-empty-card {
+                height: 0 !important;
+                padding-top: 0;
+                padding-bottom: 0;
+                margin-top: 0;
+                margin-bottom: 0;
+            }
+
             .is-selected {
                 background: mat-color($primary, 100);
                 padding-bottom: 31px;
diff --git a/lib/core/datatable/components/datatable/datatable.component.ts b/lib/core/datatable/components/datatable/datatable.component.ts
index 6e4e34407d..ca31e11443 100644
--- a/lib/core/datatable/components/datatable/datatable.component.ts
+++ b/lib/core/datatable/components/datatable/datatable.component.ts
@@ -161,6 +161,9 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
     isSelectAllChecked: boolean = false;
     selection = new Array<DataRow>();
 
+    /** This array of fake rows fix the flex layout for the gallery view */
+    fakeRows = [];
+
     private clickObserver: Observer<DataRowEvent>;
     private click$: Observable<DataRowEvent>;
 
@@ -188,6 +191,7 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
                 })
             );
         }
+        this.datatableLayoutFix();
         this.setTableSchema();
     }
 
@@ -220,6 +224,10 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
         if (this.isPropertyChanged(changes['sorting'])) {
             this.setTableSorting(changes['sorting'].currentValue);
         }
+
+        if (this.isPropertyChanged(changes['display'])) {
+            this.datatableLayoutFix();
+        }
     }
 
     ngDoCheck() {
@@ -654,4 +662,16 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
             this.dataRowsChanged = null;
         }
     }
+
+    datatableLayoutFix() {
+        const maxGalleryRows = 25;
+
+        if (this.display === 'gallery') {
+            for (let i = 0; i < maxGalleryRows; i++) {
+               this.fakeRows.push('');
+            }
+        } else {
+            this.fakeRows = [];
+        }
+    }
 }