From e9238bcb04f75a5ef0d801ef7a4c372832d83aad Mon Sep 17 00:00:00 2001
From: serhii balko <serhii.balko@transoftgroup.com>
Date: Wed, 24 Jan 2018 14:32:16 +0200
Subject: [PATCH] Forwardport of magento/magento2#12141 to 2.3-develop branch

---
 app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
index 9e9427f5ce72c..bc57374476735 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
@@ -45,7 +45,8 @@ define([
                 component: this,
                 selector: 'button'
             }, function (element) {
-                this.$wysiwygEditorButton = $(element);
+                this.$wysiwygEditorButton = this.$wysiwygEditorButton ?
+                    this.$wysiwygEditorButton.add($(element)) : $(element);
             }.bind(this));
 
             return this;
@@ -94,7 +95,7 @@ define([
             this.$wysiwygEditorButton.attr('disabled', status);
 
             /* eslint-disable no-undef */
-            if (wysiwygAdapter) {
+            if (wysiwygAdapter && wysiwygAdapter.activeEditor()) {
                 _.each(wysiwygAdapter.activeEditor().controlManager.controls, function (property, index, controls) {
                     controls[property.id].setDisabled(status);
                 });