diff --git a/phpBB/search.php b/phpBB/search.php
index 3e05204043..59ed6a646b 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -247,29 +247,12 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 		$ex_fid_ary = array_unique(array_merge(array_keys($auth->acl_getf('!f_read', true)), array_keys($auth->acl_getf('!f_search', true))));
 	}
 
-	// There are two exceptional scenarios we want to consider if there are any forums where an read forum = no, can read topics = yes 
-	// In these cases, the user should see the topic title in the search results but not the link to the topic (or any posts) because
-	// they don't have the permissions for that.
-	$show_topic_title_only = false;
-
-	// Firstly, is someone doing a quick search from the viewforum page? If so, force it to be a topic-only search for that one forum
-	// We know if this is the case due to the presence of this request var
-	$forum_quick_search = $request->variable('viewforum', 0);
-	if ($forum_quick_search && $auth->acl_get('f_list_topics', $forum_quick_search) && !$auth->acl_get('f_read', $forum_quick_search))
+	// Consider if there are any forums where can read forum = no, can read topics = yes 
+	// In these cases, the user should see the topic title in the search results but not the link to the topic (or any posts) because they don't have the permissions
+	if ($request->variable('sr', '') == 'topics' && $search_fields == 'titleonly')
 	{
-		$show_topic_title_only = true;
-	}
-
-	// Secondly, is someone doing a topic search from the main search page? If so, we will strip the topic links while still showing the name
-	else if ($request->variable('sr', '') == 'topics' && $search_fields == 'titleonly')
-	{
-		// We will allow the 'can read topics = yes' forums back in to the search
-		$show_topic_title_only = true;
-	}
-
-	if ($show_topic_title_only)
-	{
-		// Remove from $ex_fid_ary any of the 'can read topics' forums (meaning they will not be excluded from the search)
+		// The user could get here from a quick search through the viewforum page, or by doing a main search displayed by topics and searching only the topic titles.
+		// Allow the 'can read topics = yes' forums back in to the search by removing from $ex_fid_ary any of the 'can read topics' forums
 		$ex_fid_ary = array_diff($ex_fid_ary, array_keys($auth->acl_getf('f_list_topics', true)));
 	}
 
@@ -375,11 +358,6 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 		$show_results = ($show_results == 'posts') ? 'posts' : 'topics';
 	}
 
-	if ($show_topic_title_only)
-	{
-		$show_results = 'topics';
-	}
-
 	// define some variables needed for retrieving post_id/topic_id information
 	$sort_by_sql = [
 		'a' => 'u.username_clean',
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 0191039400..24bb5a99bb 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -384,12 +384,18 @@ $post_alt = ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->lang['FORUM_LO
 // Display active topics?
 $s_display_active = ($forum_data['forum_type'] == FORUM_CAT && ($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS)) ? true : false;
 
-// Send the forum id and send a parameter to make it clear it's a quick search
+// Send the forum id... and maybe some other fields, depending on permissions
 $s_search_hidden_fields = [
 	'fid' => [$forum_id],
-	'viewforum' => $forum_id,
 ];
 
+if ($auth->acl_get('f_list_topics', $forum_id) && !$auth->acl_get('f_read', $forum_id))
+{
+	// If the user has list access but not read access, then force the search to only be a topic title search
+	$s_search_hidden_fields['sr'] = 'topics';
+	$s_search_hidden_fields['sf'] = 'titleonly';
+}
+
 if ($_SID)
 {
 	$s_search_hidden_fields['sid'] = $_SID;