diff --git a/common/js/common.js b/common/js/common.js
index d60cadb77..2060c3404 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -450,7 +450,7 @@ function zbxe_folder_close(id) {
 function setFixedPopupSize() {
 	var $ = jQuery;
 	var $win = $(window);
-	var $pc  = $('body>.x');
+	var $pc  = $('body>.popup');
 	var w    = Math.max($pc[0].offsetWidth, 600);
 	var h    = $pc[0].offsetHeight;
 	var dw   = $win.width();
diff --git a/common/js/xe.js b/common/js/xe.js
index 278a112a2..d94b5e596 100644
--- a/common/js/xe.js
+++ b/common/js/xe.js
@@ -737,7 +737,7 @@ function zbxe_folder_close(id) {
 function setFixedPopupSize() {
 	var $ = jQuery;
 	var $win = $(window);
-	var $pc  = $('body>.x');
+	var $pc  = $('body>.popup');
 	var w    = Math.max($pc[0].offsetWidth, 600);
 	var h    = $pc[0].offsetHeight;
 	var dw   = $win.width();
diff --git a/common/js/xe.min.js b/common/js/xe.min.js
index 3893e8d95..c23eec3b7 100644
--- a/common/js/xe.min.js
+++ b/common/js/xe.min.js
@@ -735,7 +735,7 @@ function zbxe_folder_close(id) {
 function setFixedPopupSize() {
 	var $ = jQuery;
 	var $win = $(window);
-	var $pc  = $('body>.x');
+	var $pc  = $('body>.popup');
 	var w    = Math.max($pc[0].offsetWidth, 600);
 	var h    = $pc[0].offsetHeight;
 	var dw   = $win.width();
diff --git a/common/tpl/popup_layout.html b/common/tpl/popup_layout.html
index aea1124fd..1a9cecd8c 100644
--- a/common/tpl/popup_layout.html
+++ b/common/tpl/popup_layout.html
@@ -1,5 +1,5 @@
 <load target="../../modules/admin/tpl/css/admin.css" />
-<div class="x">
+<div class="x popup">
     {$content}
 </div>
 <script type="text/javascript">