diff --git a/ajax/brick/infinite/row.php b/ajax/brick/infinite/row.php
index f25ab45d4fb6ef3391c8b66c5ea3c261d6a02ca4..8ca6b2ccc7339cf5ce4099faf7eb57ede384245f 100644
--- a/ajax/brick/infinite/row.php
+++ b/ajax/brick/infinite/row.php
@@ -33,7 +33,9 @@ function ($brickId, $brickUID, $row) {
 
         $Engine->assign(array(
             'children' => $Infinite->getRow((int)$row),
-            'row' => (int)$row
+            'row' => (int)$row,
+            'this' => $Infinite,
+            'gridClass' =>$Infinite->getAttribute('gridClass')
         ));
 
         return $Engine->fetch($Infinite->getRowTemplate());
diff --git a/src/QUI/Bricks/Controls/Children/Infinite.php b/src/QUI/Bricks/Controls/Children/Infinite.php
index 97536f9e5e802408c7d35502bdea49594821d5bf..92fc70b647a7cf6aa31ff3c2e7c7074ba1b6c53c 100644
--- a/src/QUI/Bricks/Controls/Children/Infinite.php
+++ b/src/QUI/Bricks/Controls/Children/Infinite.php
@@ -22,7 +22,7 @@ public function __construct($attributes = array())
     {
         $childrenPerRow = $this->getAttribute('childrenPerRow');
         $rows           = $this->getAttribute('rows');
-        
+
         // default options
         $this->setAttributes(array(
             'class'          => 'quiqqer-bricks-children-infinite',
@@ -51,8 +51,7 @@ public function getBody()
         $Engine   = QUI::getTemplateManager()->getEngine();
         $children = '';
 
-        switch ($this->getAttribute('childrenPerRow'))
-        {
+        switch ($this->getAttribute('childrenPerRow')) {
             case 2 :
                 $this->setAttribute('gridClass', 'grid-50');
                 break;
@@ -69,6 +68,8 @@ public function getBody()
                 $this->setAttribute('gridClass', 'grid-25');
         }
 
+
+
         $this->setAttribute(
             'data-qui-options-childrenperrow',
             $this->getAttribute('childrenPerRow')
@@ -79,15 +80,16 @@ public function getBody()
             $Engine->assign(array(
                 'children' => $this->getRow($i),
                 'row'      => $i,
-                'this' => $this
+                'this'     => $this,
+                'gridClass' => $this->getAttribute('gridClass')
             ));
 
             $children .= $Engine->fetch($this->getRowTemplate());
         }
 
         $Engine->assign(array(
-            'this'           => $this,
-            'children'       => $children
+            'this'     => $this,
+            'children' => $children
         ));
 
         return $Engine->fetch(dirname(__FILE__) . '/Infinite.html');
diff --git a/src/QUI/Bricks/Controls/Children/InfiniteRow.html b/src/QUI/Bricks/Controls/Children/InfiniteRow.html
index ab7eeb9c5c6297c4cd676a8391532d236bd10ef7..ca7b26829028b2bb461418a0d514b4507e03a20e 100644
--- a/src/QUI/Bricks/Controls/Children/InfiniteRow.html
+++ b/src/QUI/Bricks/Controls/Children/InfiniteRow.html
@@ -1,6 +1,5 @@
 <div data-row="{$row}" class="quiqqer-bricks-children-infinite-row">
     {foreach from=$children item=Child}
-    {assign var=gridClass value=$this->getAttribute('gridClass')}
     <div class="{$gridClass} mobile-grid-50 quiqqer-bricks-children-infinite-child">
         <article class="quiqqer-bricks-children-infinite-child-display">
             {assign var=attrTitle value=$Child->getAttribute('title')|escape:"html"}