diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index f0d9891d36..6ed0dd6bab 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -323,7 +323,7 @@
 	<!-- INCLUDE quickreply_editor.html -->
 <!-- ENDIF -->
 
-<!-- IF S_NUM_POSTS > 1 -->
+<!-- IF S_NUM_POSTS > 1 or .pagination -->
 	<form id="viewtopic" method="post" action="{S_TOPIC_ACTION}">
 	<fieldset class="display-options" style="margin-top: 0; ">
 		<!-- IF not S_IS_BOT -->
diff --git a/tests/functional/paging_test.php b/tests/functional/paging_test.php
index 97ce822fdf..cfaf9104a8 100644
--- a/tests/functional/paging_test.php
+++ b/tests/functional/paging_test.php
@@ -30,12 +30,12 @@ class phpbb_functional_paging_test extends phpbb_functional_test_case
 		$this->assertContains('post no4', $crawler->text());
 		$this->assertNotContains('post no16', $crawler->text());
 
-		$next_link = $crawler->filter('#viewtopic > fieldset > a.arrow-right')->attr('href');
+		$next_link = $crawler->filter('.pagination > ul > li.next > a')->attr('href');
 		$crawler = self::request('GET', $next_link);
 		$this->assertNotContains('post no4', $crawler->text());
 		$this->assertContains('post no16', $crawler->text());
 
-		$prev_link = $crawler->filter('#viewtopic > fieldset > a.arrow-left')->attr('href');
+		$prev_link = $crawler->filter('.pagination > ul > li.previous > a')->attr('href');
 		$crawler = self::request('GET', $prev_link);
 		$this->assertContains('post no4', $crawler->text());
 		$this->assertNotContains('post no16', $crawler->text());