diff --git a/js/functions.js b/js/functions.js
index e2d8473cd..deee5ef82 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1781,15 +1781,17 @@ $(document).ready(function() {
         // Center the popup
         var windowWidth = document.documentElement.clientWidth;
         var windowHeight = document.documentElement.clientHeight;
-        var popupWidth = $("#enum_editor").width();
-        var popupHeight = $("#enum_editor").height();
-        var top = windowHeight/2 - popupHeight/2;
-        var left = windowWidth/2 - popupWidth/2;
-        $("#enum_editor").css({"position":"absolute", "top": top, "left": left});
+        var popupWidth = windowWidth/2;
+        var popupHeight = windowHeight*0.8;
+        var popupOffsetTop = windowHeight/2 - popupHeight/2;
+        var popupOffsetLeft = windowWidth/2 - popupWidth/2;
+        $("#enum_editor").css({"position":"absolute", "top": popupOffsetTop, "left": popupOffsetLeft, "width": popupWidth, "height": popupHeight});
+
         // Make it appear
         $("#popup_background").css({"opacity":"0.7"});
         $("#popup_background").fadeIn("fast");
         $("#enum_editor").fadeIn("fast");
+
         // Get the values
         var values = $(this).parent().prev("input").attr("value").split(",");
         $.each(values, function(index, val) {
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index b544a7859..1fc1a4766 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -31,6 +31,8 @@ body {
     margin:             0.5em;
     color:              <?php echo $GLOBALS['cfg']['MainColor']; ?>;
     background:         <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
+    width: 100%;
+    height: 100%;
 }
 
 <?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
@@ -1371,7 +1373,8 @@ p.enum_notice {
     position: fixed;
     _position: absolute; /* hack for IE */
     z-index: 101;
-    overflow: auto;
+    overflow-y: auto;
+    overflow-x: hidden;
 }
 
 #enum_editor_no_js {
@@ -1379,8 +1382,6 @@ p.enum_notice {
 }
 
 #enum_editor, #enum_editor_no_js {
-    width: 50%;
-    height: 80%;
     background: #D0DCE0;
     padding: 15px;
 }
@@ -1388,13 +1389,14 @@ p.enum_notice {
 #popup_background {
     display: none;
     position: fixed;
-    _position: absolute; /* hack for IE */
+    _position: absolute; /* hack for IE6 */
     width: 100%;
     height: 100%;
     top: 0;
     left: 0;
     background: #000;
     z-index: 100;
+    overflow: hidden;
 }
 
 a.close_enum_editor {
@@ -1403,6 +1405,7 @@ a.close_enum_editor {
 
 #enum_editor #values, #enum_editor_no_js #values {
     margin: 15px 0px;
+    width: 100%;
 }
 
 #enum_editor #values input, #enum_editor_no_js #values input {