diff --git a/src/UI/UIWindow.js b/src/UI/UIWindow.js
index 1f23f1221..f0950a84f 100644
--- a/src/UI/UIWindow.js
+++ b/src/UI/UIWindow.js
@@ -198,15 +198,15 @@ async function UIWindow(options) {
                 data-disable_parent_window = "${html_encode(options.disable_parent_window)}"
                 data-name="${html_encode(options.title)}" 
                 data-path ="${html_encode(options.path)}"
-                data-uid ="${options.uid}"
-                data-element_uuid="${options.element_uuid}"
-                data-parent_uuid="${options.parent_uuid}"
+                data-uid ="${html_encode(options.uid)}"
+                data-element_uuid="${html_encode(options.element_uuid)}"
+                data-parent_uuid="${html_encode(options.parent_uuid)}"
                 ${options.parent_instance_id ? `data-parent_instance_id="${options.parent_instance_id}"` : ''}
                 data-id ="${win_id}"
-                data-iframe_msg_uid ="${options.iframe_msg_uid}"
+                data-iframe_msg_uid ="${html_encode(options.iframe_msg_uid)}"
                 data-is_dir ="${options.is_dir}"
                 data-return_to_parent_window = "${options.return_to_parent_window}"
-                data-initiating_app_uuid = "${options.initiating_app_uuid}"
+                data-initiating_app_uuid = "${html_encode(options.initiating_app_uuid)}"
                 data-is_openFileDialog ="${options.is_openFileDialog}"
                 data-is_saveFileDialog ="${options.is_saveFileDialog}"
                 data-is_directoryPicker ="${options.is_directoryPicker}"
diff --git a/src/css/style.css b/src/css/style.css
index 9288a6273..e23edecfe 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -2079,7 +2079,7 @@ label {
 
 .share-recipients {
     max-height: 200px;
-    overflow: scroll;
+    overflow: hidden;
 }
 
 .feedback-sent-success {