diff --git a/phpBB/adm/style/acp_ext_gallery.html b/phpBB/adm/style/acp_ext_gallery.html
index eaf57ac284..4a435f4838 100644
--- a/phpBB/adm/style/acp_ext_gallery.html
+++ b/phpBB/adm/style/acp_ext_gallery.html
@@ -1,18 +1,23 @@
-<!-- INCLUDE overall_header.html -->
+{% include('overall_header.html') %}
 
 <a id="maincontent"></a>
 
-	<h1>{{lang( 'EXTENSIONS_ADMIN') }}</h1>
+<h1>{{lang( 'EXTENSIONS_ADMIN') }}</h1>
 
-	<p>{{lang( 'EXTENSIONS_EXPLAIN') }}</p>
+<p>{{lang( 'EXTENSIONS_EXPLAIN') }}</p>
 
-	<fieldset class="quick">
-		<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.1" target="_blank">{{ lang('BROWSE_EXTENSIONS_DATABASE') }}</a> &bull; <a href="javascript:phpbb.toggleDisplay('gallery_settings');">{{ lang('SETTINGS') }}</a></span>
-	</fieldset>
+<fieldset class="quick quick-left">
+	<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.1" target="_blank">{{ lang('BROWSE_EXTENSIONS_DATABASE') }}</a> &bull; <a href="javascript:phpbb.toggleDisplay('gallery_settings');">{{ lang('SETTINGS') }}</a></span>
+</fieldset>
 
-	<form id="gallery_settings" method="post" action="{{ U_ACTION }}" style="display:none">
+{% if pagination is defined %}
+	<div class="pagination top-pagination">
+		{% include('pagination.html') %}
+	</div>
+{% endif %}
 
-	<fieldset>
+<form id="gallery_settings" method="post" action="{{ U_ACTION }}" style="display:none">
+	<fieldset style="clear: both;">
 		<legend>{{ lang('EXTENSIONS_GALLERY_SETTINGS') }}</legend>
 		<dl>
 			<dt><label for="force_unstable">{L_FORCE_UNSTABLE}{L_COLON}</label></dt>
@@ -29,41 +34,47 @@
 			{{ S_FORM_TOKEN }}
 		</p>
 	</fieldset>
-	</form>
+</form>
 
-	<table class="table1">
-		<col class="row1" ><col class="row1" ><col class="row1" ><col class="row2" >
-	<thead>
-		<tr>
-			<th style="width: 250px;">{{ lang("EXTENSION_NAME") }}</th>
-			<th style="text-align: center; width: 80px;">{{ lang("VERSION") }}</th>
-			<th>{{ lang("DESCRIPTION") }}</th>
-			<th style="text-align: center; width: 150px;">{{ lang("EXTENSION_ACTIONS") }}</th>
-		</tr>
-	</thead>
-	<tbody>
-	{% for extension in extensions %}
-		<tr>
-			<td>
-				<strong>{{ extension.display_name }}</strong><br />
-				{{ extension.name }}
-			</td>
-			<td style="text-align: center">{{ extension.version }}</td>
-			<td>{{ extension.description }} &bull; <a href="{{ extension.url }}">{{ lang('HOMEPAGE') }}</a></td>
-			<td style="text-align: center">
-				{% if extension.name in managed_extensions %}
-					<span style="color: #228822;">{{ lang('INSTALLED') }}</span><br />
-					(<a href="{{ U_ACTION }}&amp;action=update&amp;extension={{ extension.composer_name|url_encode }}">{{ lang('UPDATE') }}</a>
-					&bull; <a href="{{ U_ACTION }}&amp;action=remove&amp;extension={{ extension.composer_name|url_encode }}" style="color: #BC2A4D;">{{ lang('REMOVE') }}</a>)
-				{% elseif extension.name in installed_extensions -%}
-					<span style="color: #BC2A4D;">{{ lang('INSTALLED_MANUALLY') }}</span> (<a href="{{ U_ACTION }}&amp;action=manage&amp;extension={{ extension.composer_name|url_encode }}">{{ lang('MANAGE') }}</a>)
-				{% else -%}
-					<a href="{{ U_ACTION }}&amp;action=install&amp;extension={{ extension.composer_name|url_encode }}">{{ lang('INSTALL') }}</a>
-				{%- endif -%}
-			</td>
-		</tr>
-	{% endfor %}
-	</tbody>
-	</table>
+<table class="table1">
+	<col class="row1" ><col class="row1" ><col class="row1" ><col class="row2" >
+<thead>
+	<tr>
+		<th style="width: 250px;">{{ lang("EXTENSION_NAME") }}</th>
+		<th style="text-align: center; width: 80px;">{{ lang("VERSION") }}</th>
+		<th>{{ lang("DESCRIPTION") }}</th>
+		<th style="text-align: center; width: 150px;">{{ lang("EXTENSION_ACTIONS") }}</th>
+	</tr>
+</thead>
+<tbody>
+{% for extension in extensions %}
+	<tr>
+		<td>
+			<strong>{{ extension.display_name }}</strong><br />
+			{{ extension.name }}
+		</td>
+		<td style="text-align: center">{{ extension.version }}</td>
+		<td>{{ extension.description }} &bull; <a href="{{ extension.url }}">{{ lang('HOMEPAGE') }}</a></td>
+		<td style="text-align: center">
+			{% if extension.name in managed_extensions %}
+				<span style="color: #228822;">{{ lang('INSTALLED') }}</span><br />
+				(<a href="{{ U_ACTION }}&amp;action=update&amp;extension={{ extension.composer_name|url_encode }}">{{ lang('UPDATE') }}</a>
+				&bull; <a href="{{ U_ACTION }}&amp;action=remove&amp;extension={{ extension.composer_name|url_encode }}" style="color: #BC2A4D;">{{ lang('REMOVE') }}</a>)
+			{% elseif extension.name in installed_extensions -%}
+				<span style="color: #BC2A4D;">{{ lang('INSTALLED_MANUALLY') }}</span> (<a href="{{ U_ACTION }}&amp;action=manage&amp;extension={{ extension.composer_name|url_encode }}">{{ lang('MANAGE') }}</a>)
+			{% else -%}
+				<a href="{{ U_ACTION }}&amp;action=install&amp;extension={{ extension.composer_name|url_encode }}">{{ lang('INSTALL') }}</a>
+			{%- endif -%}
+		</td>
+	</tr>
+{% endfor %}
+</tbody>
+</table>
 
-<!-- INCLUDE overall_footer.html -->
+{% if pagination is defined %}
+	<div class="pagination bottom-pagination">
+		{% include('pagination.html') %}
+	</div>
+{% endif %}
+
+{% include('overall_footer.html') %}
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index f81dd35531..290fee2983 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1333,6 +1333,16 @@ p.quick {
 	text-align: left;
 }
 
+fieldset.quick-left, p.quick-left {
+	margin: 15px 0 5px 0;
+	padding: 0 0px 0;
+	float: left;
+}
+
+.rtl fieldset.quick-left, .rtl p.quick-left {
+	float: right;
+}
+
 fieldset.quick legend {
 	display: none;
 }
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index bcb057ddb9..8c144b09fc 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -576,11 +576,23 @@ class acp_extensions
 			default:
 				/** @var \phpbb\composer\extension_manager $manager */
 				$manager = $phpbb_container->get('ext.composer.manager');
+
+				/** @var \phpbb\pagination $pagination */
+				$pagination = $phpbb_container->get('pagination');
+
+				$start = $this->request->variable('start', 0);
+				$base_url = $this->u_action;
+
+				$available_extensions = $manager->get_available_packages();
+				$extensions = array_slice($available_extensions, $start, 20);
+
+				$pagination->generate_template_pagination($base_url, 'pagination', 'start', count($available_extensions), 20, $start);
+
 				$this->page_title = 'ACP_EXTENSIONS_GALLERY';
 				$this->tpl_name = 'acp_ext_gallery';
 
 				$this->request->enable_super_globals();
-				$this->template->assign_var('extensions', $manager->get_available_packages());
+				$this->template->assign_var('extensions', $extensions);
 				$this->template->assign_var('managed_extensions', array_keys($manager->get_managed_packages()));
 				$this->template->assign_var('installed_extensions', array_keys($extensions_manager->all_available()));
 				$this->template->assign_var('U_ACTION', $this->u_action);