diff --git a/src/components/com_weblinks/tmpl/category/default_items.php b/src/components/com_weblinks/tmpl/category/default_items.php
index 48c4d6f..6d598d2 100644
--- a/src/components/com_weblinks/tmpl/category/default_items.php
+++ b/src/components/com_weblinks/tmpl/category/default_items.php
@@ -183,7 +183,7 @@ $listDirn  = $this->escape($this->state->get('list.direction'));
 											<figure class="item-image">
 												<img src="<?php echo htmlspecialchars($img->url, ENT_COMPAT, 'UTF-8'); ?>"
 														<?php echo $alt; ?> itemprop="thumbnail" />
-												<?php if (!empty($images->image_first_caption)) : ?>
+												<?php if (!empty($images->image_second_caption)) : ?>
 													<figcaption class="caption"><?php echo htmlspecialchars($images->image_second_caption, ENT_COMPAT, 'UTF-8'); ?></figcaption>
 												<?php endif; ?>
 											</figure>
diff --git a/src/components/com_weblinks/tmpl/form/edit.php b/src/components/com_weblinks/tmpl/form/edit.php
index d3cc566..054da76 100644
--- a/src/components/com_weblinks/tmpl/form/edit.php
+++ b/src/components/com_weblinks/tmpl/form/edit.php
@@ -63,11 +63,13 @@ $params = $this->state->get('params');
 		<?php echo $this->form->renderField('image_first_alt', 'images'); ?>
 		<?php echo $this->form->renderField('image_first_alt_empty', 'images'); ?>
 		<?php echo $this->form->renderField('float_first', 'images'); ?>
+		<?php echo $this->form->renderField('image_first_caption', 'images'); ?>
 
 		<?php echo $this->form->renderField('image_second', 'images'); ?>
 		<?php echo $this->form->renderField('image_second_alt', 'images'); ?>
 		<?php echo $this->form->renderField('image_second_alt_empty', 'images'); ?>
 		<?php echo $this->form->renderField('float_second', 'images'); ?>
+		<?php echo $this->form->renderField('image_second_caption', 'images'); ?>
 
 
 		<?php if ($captchaEnabled) : ?>