diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 6361e86c9b..04b8ad1597 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -239,6 +239,7 @@ if ($forum_data['forum_postable'])
 		'S_TOPIC_ICONS'		=> ($forum_data['enable_icons']) ? true : false, 
 		'S_WATCH_FORUM' 	=> $s_watching_forum,
 		'S_FORUM_ACTION' 	=> 'viewforum.' . $phpEx . $SID . '&f=' . $forum_id . "&start=$start",
+		'S_SEARCHBOX_ACTION'=> "search.$phpEx$SID&f=$forum_id", 
 
 		'U_POST_NEW_TOPIC'	=> 'posting.' . $phpEx . $SID . '&mode=post&f=' . $forum_id,
 		'U_MARK_READ' 		=> 'viewforum.' . $phpEx . $SID . '&f=' . $forum_id . '&mark=topics')
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 7e3539d469..5258952d7e 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -346,7 +346,8 @@ $template->assign_vars(array(
 	'S_TOPIC_ACTION' 		=> "viewtopic.$phpEx$SID&t=" . $topic_id . "&start=$start",
 	'S_TOPIC_MOD' 			=> ($topic_mod != '') ? '<select name="mode">' . $topic_mod . '</select>' : '',
 	'S_MOD_ACTION' 			=> "mcp.$phpEx?sid=" . $user->session_id . "&amp;t=$topic_id&amp;quickmod=1",
-	'S_WATCH_TOPIC' 		=> $s_watching_topic,
+	'S_WATCH_TOPIC' 		=> $s_watching_topic, 
+	'S_SEARCHBOX_ACTION'	=> "search.$phpEx$SID&amp;f=$forum_id", 
 
 	'U_TOPIC'				=> $server_path . 'viewtopic.' . $phpEx  . '?t=' . $topic_id,
 	'U_FORUM'				=> $server_path,