diff --git a/lib/weblib.php b/lib/weblib.php
index 78c575dccd0..589737da008 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -944,7 +944,7 @@ function popup_form($common, $options, $formid, $selected='', $nothing='choose',
         $selectlabel = '<label for="'.$formid.'_jump">'.$selectlabel.'</label>';
     }
 
-    $output .= '<fieldset class="invisiblefieldset">'.$selectlabel.$button.'<select id="'.$formid.'_jump" name="jump" onchange="'.$targetwindow.'.location=document.getElementById(\''.$formid.'\').jump.options[document.getElementById(\''.$formid.'\').jump.selectedIndex].value;">'."\n";
+    $output .= '<div>'.$selectlabel.$button.'<select id="'.$formid.'_jump" name="jump" onchange="'.$targetwindow.'.location=document.getElementById(\''.$formid.'\').jump.options[document.getElementById(\''.$formid.'\').jump.selectedIndex].value;">'."\n";
 
     if ($nothing != '') {
         $output .= "   <option value=\"javascript:void(0)\">$nothing</option>\n";
@@ -1024,7 +1024,7 @@ function popup_form($common, $options, $formid, $selected='', $nothing='choose',
                "\n//<![CDATA[\n".
                'document.getElementById("noscript'.$formid.'").style.display = "none";'.
                "\n//]]>\n".'</script>';
-    $output .= '</fieldset>';
+    $output .= '</div>';
     $output .= '</form>';
 
     if ($return) {
@@ -5775,4 +5775,4 @@ function frametarget() {
 }
 
 // vim:autoindent:expandtab:shiftwidth=4:tabstop=4:tw=140:
-?>
\ No newline at end of file
+?>
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index f426a4d2c35..36f95f9d791 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -341,8 +341,9 @@ img.emoticon {
   height: 15px;
 }
 
-form.popupform {
-  display: inline;
+form.popupform,
+form.popupform div {
+    display: inline;
 }
 
 form.popupform label {