diff --git a/media/com_joomgallery/js/joomgrid.js b/media/com_joomgallery/js/joomgrid.js
index 1cb132458..165a8f538 100644
--- a/media/com_joomgallery/js/joomgrid.js
+++ b/media/com_joomgallery/js/joomgrid.js
@@ -4,6 +4,7 @@ const defaults = {
         pagination: 1,
         layout: 'masonry',
         num_columns: 3,
+        num_images: 12,
         lightbox: false,
         thumbnails: false,
         lightboxes: {},
@@ -79,7 +80,7 @@ var callback = function() {
     const imgs = document.querySelectorAll('.' + window.joomGrid.gridclass + ' img');
     const options = {
       idealHeight: window.joomGrid.justified.height,
-      maxRowImgs: 16,
+      maxRowImgs: Math.ceil(window.joomGrid.num_images * 1.2),
       rowGap: window.joomGrid.justified.gap,
       columnGap: window.joomGrid.justified.gap,
     };
diff --git a/site/com_joomgallery/src/Model/GalleryModel.php b/site/com_joomgallery/src/Model/GalleryModel.php
index 0766e20a6..06cd968a6 100644
--- a/site/com_joomgallery/src/Model/GalleryModel.php
+++ b/site/com_joomgallery/src/Model/GalleryModel.php
@@ -201,7 +201,7 @@ protected function setImagesModelState(ListModel &$listModel, array $fields = ar
     }
 
     // Load the number of images defined in the configuration
-    $listModel->setState('list.limit', $params['configs']->get('jg_gallery_view_numb_images', 12, 'int'));
+    $listModel->setState('list.limit', $params['configs']->get('jg_gallery_view_numb_images', 15, 'int'));
 
     // Apply number of images to be loaded from list in the view
     if(isset($imgform_list['limit']))
diff --git a/site/com_joomgallery/tmpl/category/default_cat.php b/site/com_joomgallery/tmpl/category/default_cat.php
index 0e9c1563f..ff850d3a9 100644
--- a/site/com_joomgallery/tmpl/category/default_cat.php
+++ b/site/com_joomgallery/tmpl/category/default_cat.php
@@ -101,6 +101,7 @@
 $iniJS .= '  pagination: ' . $use_pagination . ',';
 $iniJS .= '  layout: "' . $category_class . '",';
 $iniJS .= '  num_columns: ' . $num_columns . ',';
+$iniJS .= '  num_images: ' . $numb_images . ',';
 $iniJS .= '  lightbox: ' . ($lightbox ? 'true' : 'false') . ',';
 $iniJS .= '  thumbnails: ' . ($thumbnails ? 'true' : 'false') . ',';
 $iniJS .= '  justified: {height: '.$justified_height.', gap: '.$justified_gap.'}';
diff --git a/site/com_joomgallery/tmpl/gallery/default.php b/site/com_joomgallery/tmpl/gallery/default.php
index 1392916cf..ca1ca9fed 100644
--- a/site/com_joomgallery/tmpl/gallery/default.php
+++ b/site/com_joomgallery/tmpl/gallery/default.php
@@ -18,6 +18,7 @@
 $image_type              = $this->params['configs']->get('jg_gallery_view_type_image', 'thumbnail', 'STRING');
 $gallery_class           = $this->params['configs']->get('jg_gallery_view_class', 'masonry', 'STRING');
 $num_columns             = $this->params['configs']->get('jg_gallery_view_num_columns', 3, 'INT');
+$numb_images             = $this->params['configs']->get('jg_gallery_view_numb_images', 15, 'INT');
 $image_class             = $this->params['configs']->get('jg_gallery_view_image_class', 0, 'INT');
 $justified_height        = $this->params['configs']->get('jg_gallery_view_justified_height', 200, 'INT');
 $justified_gap           = $this->params['configs']->get('jg_gallery_view_justified_gap', 5, 'INT');
@@ -57,6 +58,7 @@
 $iniJS .= '  pagination: 0,';
 $iniJS .= '  layout: "' . $gallery_class . '",';
 $iniJS .= '  num_columns: ' . $num_columns . ',';
+$iniJS .= '  num_images: ' . $numb_images . ',';
 $iniJS .= '  lightbox: ' . ($lightbox ? 'true' : 'false') . ',';
 $iniJS .= '  justified: {height: '.$justified_height.', gap: '.$justified_gap.'}';
 $iniJS .= '};';