diff --git a/library/includes/datastore/build_cat_forums.php b/library/includes/datastore/build_cat_forums.php
index 0df4353ff..0f52729bc 100644
--- a/library/includes/datastore/build_cat_forums.php
+++ b/library/includes/datastore/build_cat_forums.php
@@ -106,15 +106,17 @@ $this->store('cat_forums', $data);
 //
 // jumpbox
 //
-$data = array(
-    'guest' => get_forum_select('guest', 'f', null, null, null, 'id="jumpbox" onchange="window.location.href=\'viewforum.php?f=\'+this.value;"'),
-    'user' => get_forum_select('user', 'f', null, null, null, 'id="jumpbox" onchange="window.location.href=\'viewforum.php?f=\'+this.value;"'),
-);
+if ($bb_cfg['show_jumpbox']) {
+    $data = array(
+        'guest' => get_forum_select('guest', 'f', null, null, null, 'id="jumpbox" onchange="window.location.href=\'viewforum.php?f=\'+this.value;"'),
+        'user' => get_forum_select('user', 'f', null, null, null, 'id="jumpbox" onchange="window.location.href=\'viewforum.php?f=\'+this.value;"'),
+    );
 
-$this->store('jumpbox', $data);
+    $this->store('jumpbox', $data);
 
-file_write($data['guest'], AJAX_HTML_DIR . '/jumpbox_guest.html', false, true, true);
-file_write($data['user'], AJAX_HTML_DIR . '/jumpbox_user.html', false, true, true);
+    file_write($data['guest'], AJAX_HTML_DIR . '/jumpbox_guest.html', false, true, true);
+    file_write($data['user'], AJAX_HTML_DIR . '/jumpbox_user.html', false, true, true);
+}
 
 //
 // viewtopic_forum_select
diff --git a/library/includes/functions.php b/library/includes/functions.php
index 5f1ee5330..f002d95ec 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -1000,7 +1000,11 @@ function get_userdata($u, $force_name = false, $allow_guest = false)
 
 function make_jumpbox($selected = 0)
 {
-    global $datastore, $template;
+    global $datastore, $template, $bb_cfg;
+
+    if (!$bb_cfg['show_jumpbox']) {
+        return;
+    }
 
     if (!$jumpbox = $datastore->get('jumpbox')) {
         $datastore->update('jumpbox');