diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index eee81df..4af5882 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -4,6 +4,7 @@ Changelog
 1.5.6 (Unreleased)
 -------------------------
 - Fix #135: Fix gallery comment URL from notifications
+- Fix: Add autofocus on edit (for HumHub 1.17 - see https://github.com/humhub/humhub/issues/7136)
 
 1.5.5 (December 22, 2023)
 -------------------------
diff --git a/views/custom-gallery/modal_gallery_edit.php b/views/custom-gallery/modal_gallery_edit.php
index 100566f..f60cd33 100644
--- a/views/custom-gallery/modal_gallery_edit.php
+++ b/views/custom-gallery/modal_gallery_edit.php
@@ -16,7 +16,9 @@
 use humhub\modules\ui\form\widgets\SortOrderField;
 use humhub\widgets\ModalButton;
 use humhub\widgets\ModalDialog;
-use yii\bootstrap\ActiveForm; ?>
+use yii\bootstrap\ActiveForm;
+
+?>
 
 <?php
 
@@ -39,7 +41,7 @@
     <?php $form = ActiveForm::begin(['id' => 'Gallery', 'class' => 'form-horizontal']); ?>
 
         <div class="modal-body">
-            <?= $form->field($gallery, 'title' )->label(Yii::t('GalleryModule.base', 'Title')); ?>
+            <?= $form->field($gallery, 'title' )->textInput(['autofocus' => ''])->label(Yii::t('GalleryModule.base', 'Title')); ?>
             <?= $form->field($gallery, 'description' )->textArea()->label(Yii::t('GalleryModule.base', 'Description')); ?>
             <?php if (!$sortByCreated): ?>
                 <?= $form->field($gallery, 'sort_order')->widget(SortOrderField::class, []); ?>