diff --git a/core/modules/views/templates/views-view-grid.html.twig b/core/modules/views/templates/views-view-grid.html.twig
index 41113f8..f2b1552 100644
--- a/core/modules/views/templates/views-view-grid.html.twig
+++ b/core/modules/views/templates/views-view-grid.html.twig
@@ -34,63 +34,45 @@
     'clearfix',
   ]
 %}
+{% if options.row_class_default %}
+  {%
+    set row_classes = [
+      'views-row',
+      options.alignment == 'horizontal' ? 'clearfix',
+    ]
+  %}
+{% endif %}
+{% if options.col_class_default %}
+  {%
+    set col_classes = [
+      'views-col',
+      options.alignment == 'vertical' ? 'clearfix',
+    ]
+  %}
+{% endif %}
 {% if title %}
   <h3>{{ title }}</h3>
 {% endif %}
 <div{{ attributes.addClass(classes) }}>
-{% if options.alignment == 'horizontal' %}
-  {% for row in items %}
-  {% if options.row_class_default %}
-    {%
-      set row_classes = [
-        'views-row',
-        'row-' ~ loop.index,
-        'clearfix',
-      ]
-    %}
-  {% endif %}
-  <div{{ row.attributes.addClass(row_classes) }}>
-    {% for column in row.content %}
-    {% if options.col_class_default %}
-      {%
-        set col_classes = [
-          'views-col',
-          'col-' ~ loop.index,
-        ]
-      %}
-    {% endif %}
-    <div{{ column.attributes.addClass(col_classes) }}>
-      {{ column.content }}
-    </div>
+  {% if options.alignment == 'horizontal' %}
+    {% for row in items %}
+      <div{{ row.attributes.addClass(row_classes, options.row_class_default ? 'row-' ~ loop.index) }}>
+        {% for column in row.content %}
+          <div{{ column.attributes.addClass(col_classes, options.col_class_default ? 'col-' ~ loop.index) }}>
+            {{ column.content }}
+          </div>
+        {% endfor %}
+      </div>
     {% endfor %}
-  </div>
-  {% endfor %}
-{% else %}
-  {% for column in items %}
-    {% if options.col_class_default %}
-      {%
-        set col_classes = [
-          'views-col',
-          'col-' ~ loop.index,
-          'clearfix',
-        ]
-      %}
-    {% endif %}
-    <div{{ column.attributes.addClass(col_classes) }}>
-      {% for row in column.content %}
-        {% if options.row_class_default %}
-          {%
-            set row_classes = [
-              'views-row',
-              'row-' ~ loop.index,
-            ]
-          %}
-        {% endif %}
-        <div{{ row.attributes.addClass(row_classes) }}>
-          {{ row.content }}
-        </div>
-      {% endfor %}
-    </div>
-  {% endfor %}
-{% endif %}
+  {% else %}
+    {% for column in items %}
+      <div{{ column.attributes.addClass(col_classes, options.col_class_default ? 'col-' ~ loop.index) }}>
+        {% for row in column.content %}
+          <div{{ row.attributes.addClass(row_classes, options.row_class_default ? 'row-' ~ loop.index) }}>
+            {{ row.content }}
+          </div>
+        {% endfor %}
+      </div>
+    {% endfor %}
+  {% endif %}
 </div>