WYSIWYG Image-Popup is not working correctly with multipleEditors

Author: Nazar65

lib/web/mage/adminhtml/browser.js

@@ -51,22 +51,26 @@ define([
             var windowId = this.windowId,
                 content = '<div class="popup-window" id="' + windowId + '"></div>',
                 self = this;
-	        
-		if (this.modalLoaded === true
-                   || (self.targetElementId
-                   && self.targetElementId === options.targetElementId)) {
-                
-		if (options && typeof options.closed !== 'undefined') {
+
+            if (options
+                && self.targetElementId
+                && self.targetElementId === options.targetElementId
+            ) {
+                if (typeof options.closed !== 'undefined') {
                     this.modal.modal('option', 'closed', options.closed);
                 }
                 this.modal.modal('openModal');
 
                 return;
+            } else if (typeof options === 'undefined' 
+                       && self.modalLoaded === true) {
+                      this.modal.modal('openModal');
+                      return;
             }
 
             if (this.modal) {
                 this.modal.html($(content).html());
-
+                    
                 if (options && typeof options.closed !== 'undefined') {
                     this.modal.modal('option', 'closed', options.closed);
                 }
@@ -88,9 +92,11 @@ define([
             }).done(function (data) {
                 self.modal.html(data).trigger('contentUpdated');
                 self.modalLoaded = true;
-		options ? self.targetElementId = options.targetElementId : ''; 
+                self.targetElementId = options 
+			    ? options.targetElementId 
+			    : 'null';
             });
-	},
+        },
 
         /**
          * Close dialog.

lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js

@@ -375,7 +375,7 @@ define([
          */
         openFileBrowser: function (o) {
             var typeTitle = this.translate('Select Images'),
-                storeId = this.config['store_id'] !== null ? this.config['store_id'] : 0,
+                storeId = this.config['store_id'] ? this.config['store_id'] : 0,
                 frameDialog = jQuery('div.mce-container[role="dialog"]'),
                 self = this,
                 wUrl = this.config['files_browser_window_url'] +