diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 9eb5dd3915..2399882dcb 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -146,7 +146,7 @@ function make_jumpbox($match_forum_id = 0)
 		$total_forums = $db->sql_numrows($q_forums);
 		$forum_rows = $db->sql_fetchrowset($q_forums);
 
-		$boxstring = '<select name="' . POST_FORUM_URL . '"><option value="-1">' . $lang['Select_forum'] . '</option>';
+		$boxstring = '<select name="' . POST_FORUM_URL . '" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"><option value="-1">' . $lang['Select_forum'] . '</option>';
 		for($i = 0; $i < $total_categories; $i++)
 		{ 
 			$boxstring .= '<option value="-1">&nbsp;</option>';
@@ -830,7 +830,7 @@ function smilies_pass($message)
 	usort($smilies, 'smiley_sort');
 	for($i = 0; $i < count($smilies); $i++)
 	{
-		$orig[] = "'(?<=.\\W|\\W.|^\\W)" . preg_quote($smilies[$i]['code']) . "(?=.\\W|\\W.|\\W$)'i";
+		$orig[] = "/(?<=.\\W|\\W.|^\\W)" . preg_quote($smilies[$i]['code']) . "(?=.\\W|\\W.|\\W$)/i";
 		$repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['smile_url'] . '" border="0">';
 	}
 
diff --git a/phpBB/templates/subSilver/jumpbox.tpl b/phpBB/templates/subSilver/jumpbox.tpl
index 69ca29e154..4b76d3aae3 100644
--- a/phpBB/templates/subSilver/jumpbox.tpl
+++ b/phpBB/templates/subSilver/jumpbox.tpl
@@ -1,5 +1,5 @@
 
-<form method="post" action="{S_JUMPBOX_ACTION}">
+<form method="post" name="jumpbox" action="{S_JUMPBOX_ACTION}">
   <table cellspacing="0" cellpadding="0" border="0">
 	<tr> 
 	  <td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}:&nbsp;{S_JUMPBOX_LIST}&nbsp;