diff --git a/app/elfindernw.php b/app/elfindernw.php
index d7d28da..7916f04 100644
--- a/app/elfindernw.php
+++ b/app/elfindernw.php
@@ -60,7 +60,7 @@
 					lang : '<?php echo $lang; ?>',
 					<?php } ?>
 					customData : { path : "<?php echo $path.'/'.$currentuser["username"].'/'; ?>" },
-					height : 550
+					height : (window.innerHeight - 20)
 				});
 			});
 		</script>
diff --git a/module.zpm b/module.zpm
index 05b00b2..93356d9 100644
--- a/module.zpm
+++ b/module.zpm
@@ -26,7 +26,7 @@
         <!-- iframe by TGates -->
 <iframe src="modules/ELFileManager/app/elfinder.php?id=<@ UserID @>" scrolling="no" width="100%" height="200px" id="iframe1" marginheight="0" frameborder="0" onLoad="autoResize('iframe1');"></iframe>
 		
-		<form name="FileManager" action="modules/ELFileManager/app/elfindernw.php?id=<@ UserID @>" target="FileManager" method="post" onsubmit="var w=window.open('', 'FileManager', 'scrollbars=no,menubar=no,height=600,width=1024,resizable=no,toolbar=no,location=no,status=no'); w.focus();">
+		<form name="FileManager" action="modules/ELFileManager/app/elfindernw.php?id=<@ UserID @>" target="FileManager" method="post" onsubmit="var w=window.open('', 'FileManager', 'scrollbars=no,menubar=no,height='+screen.height+',width='+screen.width+',fullscreen=yes,resizable=no,toolbar=no,location=no,status=no'); w.moveTo(0,0); w.focus();">
 		<button class="btn btn-primary" type="submit" name="inOpen" value="<@ UseriD @>"><: Launch In New Window :></button>
 		</form>
         </div>