diff --git a/vendor/magento/module-page-builder/view/adminhtml/web/js/content-type/column-group/preview.js b/vendor/magento/module-page-builder/view/adminhtml/web/js/content-type/column-group/preview.js
index 3cdba715f..f4c7b2e07 100644
--- a/vendor/magento/module-page-builder/view/adminhtml/web/js/content-type/column-group/preview.js
+++ b/vendor/magento/module-page-builder/view/adminhtml/web/js/content-type/column-group/preview.js
@@ -15,7 +15,7 @@ function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.crea
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-type-menu/hide-show-option", "Magento_PageBuilder/js/events", "underscore", "Magento_PageBuilder/js/config", "Magento_PageBuilder/js/content-type-factory", "Magento_PageBuilder/js/drag-drop/move-content-type", "Magento_PageBuilder/js/drag-drop/registry", "Magento_PageBuilder/js/drag-drop/sortable", "Magento_PageBuilder/js/utils/create-stylesheet", "Magento_PageBuilder/js/content-type/column/resize", "Magento_PageBuilder/js/content-type/preview-collection", "Magento_PageBuilder/js/content-type/column-group/drag-and-drop", "Magento_PageBuilder/js/content-type/column-group/factory", "Magento_PageBuilder/js/content-type/column-group/grid-size", "Magento_PageBuilder/js/content-type/column-group/registry"], function (_jquery, _knockout, _translate, _hideShowOption, _events, _underscore, _config, _contentTypeFactory, _moveContentType, _registry, _sortable, _createStylesheet, _resize, _previewCollection, _dragAndDrop, _factory, _gridSize, _registry2) {
+define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-type-menu/hide-show-option", "Magento_PageBuilder/js/events", "underscore", "Magento_PageBuilder/js/config", "Magento_PageBuilder/js/content-type-factory", "Magento_PageBuilder/js/drag-drop/move-content-type", "Magento_PageBuilder/js/drag-drop/registry", "Magento_PageBuilder/js/drag-drop/sortable", "Magento_PageBuilder/js/utils/check-stage-full-screen", "Magento_PageBuilder/js/utils/create-stylesheet", "Magento_PageBuilder/js/content-type/column/resize", "Magento_PageBuilder/js/content-type/preview-collection", "Magento_PageBuilder/js/content-type/column-group/drag-and-drop", "Magento_PageBuilder/js/content-type/column-group/factory", "Magento_PageBuilder/js/content-type/column-group/grid-size", "Magento_PageBuilder/js/content-type/column-group/registry"], function (_jquery, _knockout, _translate, _hideShowOption, _events, _underscore, _config, _contentTypeFactory, _moveContentType, _registry, _sortable, _checkStageFullScreen, _createStylesheet, _resize, _previewCollection, _dragAndDrop, _factory, _gridSize, _registry2) {
   function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
   /**
@@ -98,7 +98,7 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
         }
       });
 
-      _events.on("stage:" + _this.contentType.stageId + ":fullScreenModeChangeAfter", _this.moveContentsToNewColumnGroup.bind(_assertThisInitialized(_this)));
+      _events.on("stage:" + _this.contentType.stageId + ":readyAfter", _this.moveContentsToNewColumnGroup.bind(_assertThisInitialized(_this)));
 
       _events.on("column-group:renderAfter", function (args) {
         if (args.contentType.id === _this.contentType.id) {
@@ -593,7 +593,7 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
       var children = this.contentType.getChildren()();
       var hasColumnLine = false;
 
-      if (children.length === 0) {
+      if (children.length === 0 && (0, _checkStageFullScreen)(contentType.stageId)) {
         // new column group, so it has a column line
         hasColumnLine = true;
       }
diff --git a/vendor/magento/module-page-builder/view/adminhtml/web/ts/js/content-type/column-group/preview.ts b/vendor/magento/module-page-builder/view/adminhtml/web/ts/js/content-type/column-group/preview.ts
index 041c5c5ab..4fb0946a1 100644
--- a/vendor/magento/module-page-builder/view/adminhtml/web/ts/js/content-type/column-group/preview.ts
+++ b/vendor/magento/module-page-builder/view/adminhtml/web/ts/js/content-type/column-group/preview.ts
@@ -21,6 +21,7 @@ import {DataObject} from "../../data-store";
 import {moveContentType} from "../../drag-drop/move-content-type";
 import {getDraggedContentTypeConfig} from "../../drag-drop/registry";
 import {hiddenClass} from "../../drag-drop/sortable";
+import checkStageFullScreen from "../../utils/check-stage-full-screen";
 import {createStyleSheet} from "../../utils/create-stylesheet";
 import {default as ColumnGroupPreview} from "../column-group/preview";
 import {BindResizeHandleEventParamsInterface, InitElementEventParamsInterface} from "../column/column-events.types";
@@ -134,7 +135,7 @@ export default class Preview extends PreviewCollection {
         });
 
         events.on(
-            `stage:${this.contentType.stageId}:fullScreenModeChangeAfter`,
+            `stage:${this.contentType.stageId}:readyAfter`,
             this.moveContentsToNewColumnGroup.bind(this),
         );
 
@@ -624,7 +625,7 @@ export default class Preview extends PreviewCollection {
     private hasColumnLine(contentType: ContentTypeInterface | ContentTypeCollectionInterface): boolean {
         const children = this.contentType.getChildren()();
         let hasColumnLine = false;
-        if (children.length === 0) {
+        if (children.length === 0 && checkStageFullScreen(contentType.stageId)) {
             // new column group, so it has a column line
             hasColumnLine = true;
         }