diff --git a/src/app/shared/object-grid/object-grid.component.html b/src/app/shared/object-grid/object-grid.component.html
index b3ad9cc27c..0afd623d86 100644
--- a/src/app/shared/object-grid/object-grid.component.html
+++ b/src/app/shared/object-grid/object-grid.component.html
@@ -11,10 +11,10 @@
   (sortDirectionChange)="onSortDirectionChange($event)"
   (sortFieldChange)="onSortFieldChange($event)"
   (paginationChange)="onPaginationChange($event)">
-    <div class="container" *ngIf="objects?.hasSucceeded">
-      <div class=" card-columns row" *ngFor="let column of (columns$ | async)" @fadeIn>
-        <div class="card-column col-md-4 col-12" *ngFor="let object of column">
-          <ds-listable-object-component-loader class="card-element" [object]="object" [viewMode]="viewMode" [context]="context" [linkType]="linkType"></ds-listable-object-component-loader>
+    <div class="card-columns row" *ngIf="objects?.hasSucceeded">
+      <div class="card-column col col-sm-6 col-lg-4" *ngFor="let column of (columns$ | async)" @fadeIn>
+        <div class="card-element" *ngFor="let object of column">
+          <ds-listable-object-component-loader [object]="object" [viewMode]="viewMode" [context]="context" [linkType]="linkType"></ds-listable-object-component-loader>
         </div>
       </div>
     </div>
diff --git a/src/app/shared/object-grid/object-grid.component.ts b/src/app/shared/object-grid/object-grid.component.ts
index c4aaebed72..c6f8347217 100644
--- a/src/app/shared/object-grid/object-grid.component.ts
+++ b/src/app/shared/object-grid/object-grid.component.ts
@@ -172,18 +172,13 @@ export class ObjectGridComponent implements OnInit {
 
         const result = [];
 
-        let index = 0;
         page.forEach((obj: ListableObject, i: number) => {
-
-          if (i % nbColumns === 0 && i > 0) {
-            index++;
-          }
-
-          let col = result[index];
+          const colNb = i % nbColumns;
+          let col = result[colNb];
           if (hasNoValue(col)) {
             col = [];
           }
-          result[index] = [...col, obj];
+          result[colNb] = [...col, obj];
         });
         return result;
       } else {