diff --git a/common/js/common.js b/common/js/common.js
index 7c9c5f2e5..1558437b9 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -205,6 +205,7 @@
 			var menu_id = params.menu_id;
 			var menus = ret_obj.menus;
 			var html = "";
+			var isMobile = navigator.userAgent.match(/mobile/i);
 
 			if(this.loaded_popup_menus[menu_id]) {
 				html = this.loaded_popup_menus[menu_id];
@@ -234,7 +235,11 @@
 							var matches = [];
 							/* if(icon) styleText = " style=\"background-image:url('"+icon+"')\" "; */
 							if (target === 'popup') {
-								click_str = 'onclick="popopen(this.href, \''+target+'\'); return false;"';
+								if (isMobile) {
+									click_str = 'onclick="openFullScreenIframe(this.href, \''+target+'\'); return false;"';
+								} else {
+									click_str = 'onclick="popopen(this.href, \''+target+'\'); return false;"';
+								}
 								classText += 'popup ';
 							} else if (target === 'javascript') {
 								click_str = 'onclick="'+url+'; return false; "';
diff --git a/common/tpl/popup_layout.html b/common/tpl/popup_layout.html
index 7de055796..27804868d 100644
--- a/common/tpl/popup_layout.html
+++ b/common/tpl/popup_layout.html
@@ -19,6 +19,7 @@
 	</script>
 	<style>
 		.x.popup { width: 100vw; height: 100vh; display: flex; flex-direction: column; }
+		.x.popup > form { width: 100vw; height: 100vh; display: flex; flex-direction: column; margin: 0; }
 		.x_modal-header { flex: 0 0 auto; }
 		.x_modal-body { flex: 1; overflow: scroll; }
 	</style>
diff --git a/modules/document/tpl/declare_document.html b/modules/document/tpl/declare_document.html
index 77cd215e4..dfb3fa468 100644
--- a/modules/document/tpl/declare_document.html
+++ b/modules/document/tpl/declare_document.html
@@ -12,6 +12,7 @@
 	<input type="hidden" name="xe_validator_id" value="modules/document/tpl/1" />
 	<div class="x_modal-header">
 		<h1>{$lang->improper_document_declare} <!--@if($type == 'cancel')-->{$lang->cmd_cancel}<!--@end--></h1>
+		<a class="close_window" href="javascript:window.close()">&times;</a>
 	</div>
 	<div class="x_modal-body x_form-horizontal" style="max-height:none">
 		<blockquote>