diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php
index 374041b9a..bc10761ae 100644
--- a/admin/batch_manager_global.php
+++ b/admin/batch_manager_global.php
@@ -622,6 +622,10 @@ if (!empty($_GET['display']))
     $page['nb_images'] = intval($_GET['display']);
   }
 }
+elseif (in_array($conf['batch_manager_images_per_page_global'], array(20, 50, 100)))
+{
+  $page['nb_images'] = $conf['batch_manager_images_per_page_global'];
+}
 else
 {
   $page['nb_images'] = 20;
diff --git a/admin/batch_manager_unit.php b/admin/batch_manager_unit.php
index f4d69d572..2e4475262 100644
--- a/admin/batch_manager_unit.php
+++ b/admin/batch_manager_unit.php
@@ -135,6 +135,10 @@ if (!empty($_GET['display']))
 {
   $page['nb_images'] = intval($_GET['display']);
 }
+elseif (in_array($conf['batch_manager_images_per_page_unit'], array(5, 10, 50)))
+{
+  $page['nb_images'] = $conf['batch_manager_images_per_page_unit'];
+}
 else
 {
   $page['nb_images'] = 5;
@@ -254,4 +258,4 @@ trigger_notify('loc_end_element_set_unit');
 // +-----------------------------------------------------------------------+
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'batch_manager_unit');
-?>
\ No newline at end of file
+?>
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 65601c290..5bc8691d3 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -844,6 +844,14 @@ $conf['upload_form_chunk_size'] = 500;
 // the directory where "ffmpeg" executable is.
 $conf['ffmpeg_dir'] = '';
 
+// batch manager: how many images should Piwigo display by default on the
+// global mode. Must be among values {20,50,100}
+$conf['batch_manager_images_per_page_global'] = 20;
+
+// batch manager: how many images should Piwigo display by default on the
+// unit mode. Must be among values {5, 10, 50}
+$conf['batch_manager_images_per_page_unit'] = 5;
+
 // +-----------------------------------------------------------------------+
 // |                                 log                                   |
 // +-----------------------------------------------------------------------+