diff --git a/modules/editor/components/emoticon/tpl/popup.html b/modules/editor/components/emoticon/tpl/popup.html
index 95c57b8b1..48f4f0135 100644
--- a/modules/editor/components/emoticon/tpl/popup.html
+++ b/modules/editor/components/emoticon/tpl/popup.html
@@ -9,6 +9,7 @@
 
 <div class="x_modal-header">
 	<h1>{$component_info->title}</h1>
+	<a class="close_window" href="javascript:window.close()">&times;</a>
 </div>
 
 <div class="x_modal-body">
diff --git a/modules/editor/components/image_gallery/tpl/popup.html b/modules/editor/components/image_gallery/tpl/popup.html
index 68fd4126d..6e806dc15 100644
--- a/modules/editor/components/image_gallery/tpl/popup.html
+++ b/modules/editor/components/image_gallery/tpl/popup.html
@@ -4,6 +4,7 @@
 {@Context::addMetaTag('viewport', 'width=device-width', FALSE);}
 <div class="x_modal-header">
 	<h1>{$component_info->title}</h1>
+	<a class="close_window" href="javascript:window.close()">&times;</a>
 </div>
 <div class="x_modal-body">
 	<form action="./" method="get" onSubmit="return false" id="fo" class="x_form-horizontal">
diff --git a/modules/editor/components/image_link/tpl/popup.html b/modules/editor/components/image_link/tpl/popup.html
index d11ed24ef..aa95bfbd7 100644
--- a/modules/editor/components/image_link/tpl/popup.html
+++ b/modules/editor/components/image_link/tpl/popup.html
@@ -4,6 +4,7 @@
 {@Context::addMetaTag('viewport', 'width=device-width', FALSE);}
 <div class="x_modal-header">
 	<h1>{$component_info->title}</h1>
+	<a class="close_window" href="javascript:window.close()">&times;</a>
 </div>
 <div class="x_modal-body">
 	<form action="./" method="get" onSubmit="return false" id="fo" class="x_form-horizontal">
diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html
index 1778b0eba..eecdefea0 100644
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@@ -11,6 +11,7 @@
 </script>
 <div class="x_modal-header">
 	<h1>{$component_info->title}</h1>
+	<a class="close_window" href="javascript:window.close()">&times;</a>
 </div>
 <div class="x_modal-body">
 	<form action="./" method="post" id="fo_component" onSubmit="procFilter(this, insert_poll); return false;" class="x_form-horizontal">
@@ -89,12 +90,12 @@
 				<th scope="row"><div>{$lang->poll_title}</div></th>
 				<td><input type="text" name="title_tidx" /></td>
 			</tr>
-			
+
 			<tr>
 				<th scope="row"><div>{$lang->poll_item} 1</div></th>
 				<td><input type="text" name="item_tidx_1" /></td>
 			</tr>
-			
+
 			<tr>
 				<th scope="row"><div>{$lang->poll_item} 2</div></th>
 				<td><input type="text" name="item_tidx_2" /></td>