Index: header.php
===================================================================
--- header.php	(revision 1710)
+++ header.php	(working copy)
@@ -457,13 +457,15 @@
 }
 
 // Get themes, [fid, [tid]]
-if (isset($tid) && is_numeric($tid) && $action != 'templates') {
+$fid = getInt('fid', 'r');
+$tid = getInt('tid', 'r');
+if ($tid > 0 && $action != 'templates') {
     $query = $db->query("SELECT f.fid, f.theme FROM ".X_PREFIX."forums f RIGHT JOIN ".X_PREFIX."threads t USING (fid) WHERE t.tid=$tid");
     $locate = $db->fetch_array($query);
     $db->free_result($query);
     $fid = $locate['fid'];
     $forumtheme = $locate['theme'];
-} else if (isset($fid) && is_numeric($fid)) {
+} else if ($fid > 0) {
     $forum = getForum($fid);
     if (($forum['type'] != 'forum' && $forum['type'] != 'sub') || $forum['status'] != 'on') {
         $forumtheme = 0;
Index: include/functions.inc.php
===================================================================
--- include/functions.inc.php	(revision 1711)
+++ include/functions.inc.php	(working copy)
@@ -1878,35 +1878,41 @@
 }
 
 function forumJump() {
-    global $lang;
+    global $fid, $lang, $selHTML;
 
     // Initialize $forumselect
     $forumselect = array();
+    $checkid = max($fid, getInt('gid', 'r'));
 
     $forumselect[] = "<select onchange=\"if (this.options[this.selectedIndex].value) {window.location=(''+this.options[this.selectedIndex].value)}\">";
-    $forumselect[] = '<option value="0" selected="selected">'.$lang['forumjumpselect'].'</option>';
+    $forumselect[] = '<option value="">'.$lang['forumjumpselect'].'</option>';
 
     // Populate $forumselect
     $permitted = getStructuredForums(TRUE);
 
     foreach($permitted['forum']['0'] as $forum) {
-        $forumselect[] = '<option value="forumdisplay.php?fid='.intval($forum['fid']).'"> &nbsp; &raquo; '.fnameOut($forum['name']).'</option>';
+        $dropselc1 = ( $checkid == $forum['fid'] ) ? $selHTML : '';
+        $forumselect[] = '<option value="forumdisplay.php?fid='.intval($forum['fid']).'" '.$dropselc1.'> &nbsp; &raquo; '.fnameOut($forum['name']).'</option>';
         if (isset($permitted['sub'][$forum['fid']])) {
             foreach($permitted['sub'][$forum['fid']] as $sub) {
-                $forumselect[] = '<option value="forumdisplay.php?fid='.intval($sub['fid']).'">&nbsp; &nbsp; &raquo; '.fnameOut($sub['name']).'</option>';
+                $dropselc2 = ( $checkid == $sub['fid'] ) ? $selHTML : '';
+                $forumselect[] = '<option value="forumdisplay.php?fid='.intval($sub['fid']).'" '.$dropselc2.'>&nbsp; &nbsp; &raquo; '.fnameOut($sub['name']).'</option>';
             }
         }
     }
 
     foreach($permitted['group']['0'] as $group) {
         if (isset($permitted['forum'][$group['fid']])) {
-            $forumselect[] = '<option value="0"></option>';
-            $forumselect[] = '<option value="index.php?gid='.intval($group['fid']).'">'.fnameOut($group['name']).'</option>';
+            $dropselc3 = ( $checkid == $group['fid'] ) ? $selHTML : '';
+            $forumselect[] = '<option value=""></option>';
+            $forumselect[] = '<option value="index.php?gid='.intval($group['fid']).'" '.$dropselc3.'>'.fnameOut($group['name']).'</option>';
             foreach($permitted['forum'][$group['fid']] as $forum) {
-                $forumselect[] = '<option value="forumdisplay.php?fid='.intval($forum['fid']).'"> &nbsp; &raquo; '.fnameOut($forum['name']).'</option>';
+                $dropselc4 = ( $checkid == $forum['fid'] ) ? $selHTML : '';
+                $forumselect[] = '<option value="forumdisplay.php?fid='.intval($forum['fid']).'" '.$dropselc4.'> &nbsp; &raquo; '.fnameOut($forum['name']).'</option>';
                 if (isset($permitted['sub'][$forum['fid']])) {
                     foreach($permitted['sub'][$forum['fid']] as $sub) {
-                        $forumselect[] = '<option value="forumdisplay.php?fid='.intval($sub['fid']).'">&nbsp; &nbsp; &raquo; '.fnameOut($sub['name']).'</option>';
+                        $dropselc5 = ( $checkid == $sub['fid'] ) ? $selHTML : '';
+                        $forumselect[] = '<option value="forumdisplay.php?fid='.intval($sub['fid']).'" '.$dropselc5.'>&nbsp; &nbsp; &raquo; '.fnameOut($sub['name']).'</option>';
                     }
                 }
             }