diff --git a/main/document/create_paint.php b/main/document/create_paint.php
index c076b0689c..f9b07464b0 100644
--- a/main/document/create_paint.php
+++ b/main/document/create_paint.php
@@ -162,5 +162,21 @@ else {
 	$credentials="false";
 }
 
-echo '<iframe style=\'height: 600px; width: 100%;\' scrolling=\'no\' frameborder=\'0\' src=\'http://pixlr.com/editor/?title='.$title.'&amp;image='.$image.'&amp;loc='.$loc.'&amp;referrer='.$referrer.'&amp;target='.$target.'&amp;exit='.$exit_path.'&amp;locktarget='.$locktarget.'&amp;locktitle='.$locktitle.'&amp;credentials='.$credentials.'\'>';
-echo '</iframe>';
\ No newline at end of file
+?>
+
+<script type="text/javascript">
+
+if (window.innerHeight){
+	height_iframe = window.innerHeight;
+}else{   
+	height_iframe = 600;
+}
+
+document.write ('<iframe frameborder="0" scrolling="no" src="<?php echo 'http://pixlr.com/editor/?title='.$title.'&amp;image='.$image.'&amp;loc='.$loc.'&amp;referrer='.$referrer.'&amp;target='.$target.'&amp;exit='.$exit_path.'&amp;locktarget='.$locktarget.'&amp;locktitle='.$locktitle.'&amp;credentials='.$credentials; ?>" width="100%" height="' + height_iframe + '"></iframe>');
+</script>
+
+<?php
+
+echo '<noscript>';
+echo '<iframe style=\'height: 600px; width: 100%;\' scrolling=\'no\' frameborder=\'0\' src=\'http://pixlr.com/editor/?title='.$title.'&amp;image='.$image.'&amp;loc='.$loc.'&amp;referrer='.$referrer.'&amp;target='.$target.'&amp;exit='.$exit_path.'&amp;locktarget='.$locktarget.'&amp;locktitle='.$locktitle.'&amp;credentials='.$credentials.'\'></iframe>';
+echo '</noscript>';
diff --git a/main/document/edit_paint.php b/main/document/edit_paint.php
index 5ca3c9e06d..3c9cc3bf7d 100644
--- a/main/document/edit_paint.php
+++ b/main/document/edit_paint.php
@@ -215,6 +215,23 @@ $image=urlencode($to_url);
 $pixlr_url = 'http://pixlr.com/editor/?title='.$title.'&amp;image='.$image.'&amp;loc='.$loc.'&amp;referrer='.$referrer.'&amp;target='.$target.'&amp;exit='.$exit_path.'&amp;locktarget='.$locktarget.'&amp;locktitle='.$locktitle.'&amp;credentials='.$credentials;
  
 //make frame an send image
-echo '<iframe style="height: 600px; width: 100%;" scrolling="no" frameborder="0" src="'.$pixlr_url.'">';
-echo '</iframe>';
+?>
+
+<script type="text/javascript">
+
+if (window.innerHeight){
+	height_iframe = window.innerHeight;
+}else{   
+	height_iframe = 600;
+}
+
+document.write ('<iframe frameborder="0" scrolling="no" src="<?php echo $pixlr_url; ?>" width="100%" height="' + height_iframe + '"></iframe>');
+
+</script>
+
+<?php
+echo '<noscript>';
+echo '<iframe style="height: 600px; width: 100%;" scrolling="no" frameborder="0" src="'.$pixlr_url.'"></iframe>';
+echo '</noscript>';
+
 Display::display_footer();