diff --git a/question/bank/bulkmove/tests/helper_test.php b/question/bank/bulkmove/tests/helper_test.php
index ce84bfd0ffb..a94c46fa85d 100644
--- a/question/bank/bulkmove/tests/helper_test.php
+++ b/question/bank/bulkmove/tests/helper_test.php
@@ -132,7 +132,7 @@ class helper_test extends \advanced_testcase {
         ob_start();
         $pagevars = [
             'qpage' => 0,
-            'qperpage' => 20,
+            'qperpage' => DEFAULT_QUESTIONS_PER_PAGE,
             'cat' => $this->cat->id . ',' . $this->context->id,
             'recurse' => false,
             'showhidden' => false,
@@ -153,7 +153,7 @@ class helper_test extends \advanced_testcase {
         ob_start();
         $pagevars = [
             'qpage' => 0,
-            'qperpage' => 20,
+            'qperpage' => DEFAULT_QUESTIONS_PER_PAGE,
             'cat' => $this->cat->id . ',' . $this->context->id,
             'recurse' => false,
             'showhidden' => false,
@@ -169,7 +169,7 @@ class helper_test extends \advanced_testcase {
         ob_start();
         $pagevars = [
             'qpage' => 0,
-            'qperpage' => 20,
+            'qperpage' => DEFAULT_QUESTIONS_PER_PAGE,
             'cat' => $this->secondcategory->id . ',' . $this->context->id,
             'category' => $this->secondcategory->id . ',' . $this->context->id,
             'recurse' => false,
diff --git a/question/bank/managecategories/classes/question_category_list.php b/question/bank/managecategories/classes/question_category_list.php
index 91869f7a173..42ff970b954 100644
--- a/question/bank/managecategories/classes/question_category_list.php
+++ b/question/bank/managecategories/classes/question_category_list.php
@@ -81,7 +81,8 @@ class question_category_list extends moodle_list {
      * @param \context $context
      */
     public function __construct($type='ul', $attributes='', $editable = false, $pageurl=null,
-                                $page = 0, $pageparamname = 'page', $itemsperpage = 20, $context = null) {
+                                $page = 0, $pageparamname = 'page',
+                                $itemsperpage = DEFAULT_QUESTIONS_PER_PAGE, $context = null) {
         parent::__construct('ul', '', $editable, $pageurl, $page, 'cpage', $itemsperpage);
         $this->context = $context;
     }
diff --git a/question/editlib.php b/question/editlib.php
index 554be2ceae4..50f333cf46e 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -30,8 +30,8 @@ defined('MOODLE_INTERNAL') || die();
 
 require_once($CFG->libdir . '/questionlib.php');
 
-define('DEFAULT_QUESTIONS_PER_PAGE', 20);
-define('MAXIMUM_QUESTIONS_PER_PAGE', 1000);
+define('DEFAULT_QUESTIONS_PER_PAGE', 100);
+define('MAXIMUM_QUESTIONS_PER_PAGE', 4000);
 
 function get_module_from_cmid($cmid) {
     global $CFG, $DB;
diff --git a/question/tests/bank_view_test.php b/question/tests/bank_view_test.php
index d1dfc0556a9..f77d30fd854 100644
--- a/question/tests/bank_view_test.php
+++ b/question/tests/bank_view_test.php
@@ -63,7 +63,7 @@ class core_question_bank_view_testcase extends advanced_testcase {
         ob_start();
         $pagevars = [
             'qpage' => 0,
-            'qperpage' => 20,
+            'qperpage' => DEFAULT_QUESTIONS_PER_PAGE,
             'cat' => $cat->id . ',' . $context->id,
             'recurse' => false,
             'showhidden' => false,
@@ -104,7 +104,7 @@ class core_question_bank_view_testcase extends advanced_testcase {
         ob_start();
         $pagevars = [
             'qpage' => 0,
-            'qperpage' => 20,
+            'qperpage' => DEFAULT_QUESTIONS_PER_PAGE,
             'cat' => $cat->id . ',' . $context->id,
             'recurse' => false,
             'showhidden' => false,