diff --git a/vendor/magento/module-page-builder/view/adminhtml/requirejs-config.js b/vendor/magento/module-page-builder/view/adminhtml/requirejs-config.js
index f7a5d86cf..b764530aa 100644
--- a/vendor/magento/module-page-builder/view/adminhtml/requirejs-config.js
+++ b/vendor/magento/module-page-builder/view/adminhtml/requirejs-config.js
@@ -41,6 +41,9 @@ var config = {
             },
             'Magento_PageBuilder/js/content-type/row/appearance/default/widget': {
                 'Magento_PageBuilder/js/content-type/row/appearance/default/widget-mixin': true
+            },
+            'Magento_Ui/js/form/element/file-uploader': {
+                'Magento_PageBuilder/js/form/element/file-uploader': true
             }
         }
     }
diff --git a/vendor/magento/module-page-builder/view/adminhtml/web/js/form/element/file-uploader.js b/vendor/magento/module-page-builder/view/adminhtml/web/js/form/element/file-uploader.js
new file mode 100644
index 000000000..aac437c59
--- /dev/null
+++ b/vendor/magento/module-page-builder/view/adminhtml/web/js/form/element/file-uploader.js
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    return function (Element) {
+        return Element.extend({
+
+            /**
+             * {@inheritDoc}
+             */
+            replaceInputTypeFile: function (fileInput) {
+                let fileId = fileInput.id, fileName = fileInput.name, fileClass = fileInput.className,
+                    spanElement =  '<span id=\'' + fileId + fileClass + '\' ></span>';
+
+                $('#' + fileId).closest('.file-uploader-area').attr('upload-area-id', fileName);
+                $('#' + fileId + fileClass).closest('.file-uploader-area').attr('upload-area-id', fileName);
+
+                $(fileInput).replaceWith(spanElement);
+
+                $('#' + fileId).closest('.file-uploader-area').find('.file-uploader-button:first').on('click', function () {
+                    $(this).closest('.file-uploader-area').find('.uppy-Dashboard-browse').trigger('click');
+                });
+
+                $('#' + fileId + fileClass).closest('.file-uploader-area').find('.action-upload-image').on('click', function () {
+                    $(this).closest('.file-uploader-area').find('.uppy-Dashboard-browse').trigger('click');
+                });
+            },
+        });
+    };
+});
diff --git a/vendor/magento/module-page-builder/view/adminhtml/web/template/form/element/uploader/preview/image.html b/vendor/magento/module-page-builder/view/adminhtml/web/template/form/element/uploader/preview/image.html
index 8a57ee602..4b95d804b 100644
--- a/vendor/magento/module-page-builder/view/adminhtml/web/template/form/element/uploader/preview/image.html
+++ b/vendor/magento/module-page-builder/view/adminhtml/web/template/form/element/uploader/preview/image.html
@@ -9,12 +9,20 @@
         <div class="pagebuilder-options-wrapper">
             <ul class="pagebuilder-options-links">
                 <li class="pagebuilder-options-link">
-                    <label
-                        data-bind="event: {mousedown: stopEvent}"
-                        class="file-uploader-button action-default"
-                        attr="for: uid"
-                        disable="disabled"
-                        translate="translations.uploadNewImage"></label>
+                    <span class="file-uploader-area" if="visibleControls">
+                        <input
+                            type="file"
+                            afterRender="onElementRender"
+                            attr="id: uid, name: inputName, multiple: isMultipleFiles"
+                            class="file-upload-options-link"
+                            disable="disabled"></input>
+                        <label
+                            data-bind="event: {mousedown: stopEvent}"
+                            class="file-uploader-button action-default action-upload-image"
+                            attr="for: uid"
+                            disable="disabled"
+                            translate="translations.uploadNewImage"></label>
+                    </span>
                 </li>
                 <li class="pagebuilder-options-link">
                     <label
@@ -38,8 +46,17 @@
             <div class="file-uploader image-uploader">
                 <div class="file-uploader-area" if="visibleControls">
                     <p class="image-upload-instructions" translate="translations.dragImageHere"></p>
-                    <input type="file" afterRender="onElementRender" attr="id: uid, name: inputName, multiple: isMultipleFiles" disable="disabled"/>
-                    <label class="file-uploader-button action-default" attr="for: uid" disable="disabled" translate="translations.uploadImage"></label>
+                    <input
+                        type="file"
+                        class="file-upload-empty-preview"
+                        afterRender="onElementRender"
+                        attr="id: uid, name: inputName, multiple: isMultipleFiles"
+                        disable="disabled"></input>
+                    <label
+                        class="file-uploader-button action-default action-upload-image"
+                        attr="for: uid"
+                        disable="disabled"
+                        translate="translations.uploadImage"></label>
                     <span translate="translations.or"></span>
                     <label
                         data-bind="event: {change: addFileFromMediaGallery, click: openMediaBrowserDialog}"